Merge branch 'xmpp'

2012-10-27 00:55:13 -04:00 · 2012-10-27 00:55:13 -04:00 · fc06ccf355
commit fc06ccf355
parent 50ad657cf2 67f4fe496f
33 changed files with 661 additions and 95 deletions
--- a/debian/control
+++ b/debian/control
@ -40,6 +40,7 @@ Build-Depends:
 	libghc-network-multicast-dev,
 	libghc-network-info-dev,
 	libghc-safesemaphore-dev,
+	libghc-network-protocol-xmpp-dev (>= 0.4.3-2),
 	ikiwiki,
 	perlmagick,
 	git,