[Pkg-haskell-commits] [package-plan] 02/02: Merge branch 'master' into new-transformers

[Joachim Breitner]

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

nomeata pushed a commit to branch new-transformers
in repository package-plan.

commit 29e42db3c7db94c1df76d30b796ff871f7c13619
Merge: 917470e f25a792
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Sep 7 19:15:29 2014 +0200

    Merge branch 'master' into new-transformers
    
    Conflicts:
    	packages.txt


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