[Pkg-haskell-commits] [package-plan] 01/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 917470e70501c98b3ac928da519b9f610fcd4bc3
Merge: 5a47a8b 2527025
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Sep 7 18:21:21 2014 +0200

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

 additional-cabals/Agda-2.4.2.cabal                 | 432 +++++++++++++++++++++
 additional-cabals/setlocale-1.0.0.cabal            |  25 --
 packages.txt                                       |   2 +-
 .../{3.0.0 => 3.0.1}/no-attoparsec-conduit.diff    |   0
 patches/wai-app-file-cgi/{3.0.0 => 3.0.1}/series   |   0
 5 files changed, 433 insertions(+), 26 deletions(-)


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