[Pkg-haskell-commits] [package-plan] 01/01: Merge branch '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 4beb09336ed2b21e1e41ac970697fa496243def7
Merge: b4ce5fb a1f9eb6
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Jul 29 16:48:29 2014 +0200

    Merge branch 'master' into quickcheck-2.7
    
    Conflicts:
    	packages.txt

 packages.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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