[Pkg-haskell-commits] [package-plan] 01/03: Merge remote-tracking branch 'origin/master' into quickcheck-2.7

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch quickcheck-2.7
in repository package-plan.

commit d55cce636ebed79903750ff6da0bc5718729e777
Merge: 5c33042 a7389b3
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Jul 27 21:42:19 2014 +0200

    Merge remote-tracking branch 'origin/master' into quickcheck-2.7
    
    Conflicts:
    	packages.txt

 packages.txt     |  2 +-
 test-packages.pl | 34 +++++++---------------------------
 2 files changed, 8 insertions(+), 28 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git