[Pkg-haskell-commits] [package-plan] 01/02: Merge branch 'ghc-7.8' into LTS-2.0

[Joachim Breitner]

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

nomeata pushed a commit to branch LTS-2.0
in repository package-plan.

commit e49d36d3aa107466af9d544edb2b7a028fd7f218
Merge: 30041be 96ea434
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Apr 20 13:26:49 2015 +0200

    Merge branch 'ghc-7.8' into LTS-2.0
    
    Conflicts:
    	packages.txt

 packages.txt     | 10 +++++-----
 test-packages.pl | 27 +++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --cc packages.txt
index 4e4efcd,080392c..c6d0e93
--- a/packages.txt
+++ b/packages.txt
@@@ -757,20 -752,20 +757,20 @@@ wai 3.0.2.
  wai-app-file-cgi 3.0.1
  wai-app-static 3.0.0.6
  wai-conduit 3.0.0.2
- wai-extra 3.0.5
+ wai-extra 3.0.7
  wai-handler-fastcgi 3.0.0
 -wai-handler-launch 3.0.0
 -wai-logger 2.1.1 notest
 -wai-websockets 3.0.0.1
 -warp 3.0.2.3
 -warp-tls 3.0.0
 +wai-handler-launch 3.0.0.3
 +wai-logger 2.2.4 notest
 +wai-websockets 3.0.0.5
 +warp 3.0.10.1
 +warp-tls 3.0.3
  webkit 0.13.1.0
  web-plugins 0.2.7
 -web-routes 0.27.8
 -web-routes-boomerang 0.28.3
 -web-routes-happstack 0.23.7
 -web-routes-hsp 0.24.5
 -web-routes-th 0.22.1
 +web-routes 0.27.8 obsolete # needs old blaze-builder
 +web-routes-boomerang 0.28.3 obsolete # needs web-routes
 +web-routes-happstack 0.23.7 obsolete # needs web-routes
 +web-routes-hsp 0.24.5 obsolete # needs web-routes
 +web-routes-th 0.22.1 obsolete # needs web-routes
  websockets 0.9.3.1
  weighted-regexp 0.3.1.2 obsolete
  wizards 1.0.2

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