Merge branch 'new-monad-control'

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2011-12-30 20:06:15 -04:00
commit 8f4fdb3f97
7 changed files with 27 additions and 11 deletions

3
debian/control vendored
View file

@ -13,7 +13,8 @@ Build-Depends:
libghc-utf8-string-dev,
libghc-hs3-dev (>= 0.5.6),
libghc-testpack-dev [any-i386 any-amd64],
libghc-monad-control-dev,
libghc-monad-control-dev (>= 0.3),
libghc-lifted-base-dev,
libghc-json-dev,
ikiwiki,
perlmagick,