Merge branch 'master' into xmpp

This commit is contained in:
Joey Hess 2012-10-25 14:43:55 -04:00
commit 52a48d1a78
5 changed files with 6 additions and 3 deletions

2
debian/control vendored
View file

@ -22,7 +22,7 @@ Build-Depends:
libghc-edit-distance-dev,
libghc-hinotify-dev [linux-any],
libghc-stm-dev (>= 2.3),
libghc-dbus-dev [linux-any],
libghc-dbus-dev [linux-any] (>= 0.10.2),
libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64],
libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64],
libghc-yesod-default-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64],