Merge branch 'xmpp'

This commit is contained in:
Joey Hess 2012-10-27 00:55:13 -04:00
commit fc06ccf355
33 changed files with 661 additions and 95 deletions

1
debian/control vendored
View file

@ -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,