[package-plan] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-haskell/package-plan into st3

[Joachim Breitner]

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

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

commit 6181d028a3dce258763ad09702d3cdac5b291089
Merge: 834a46b b58178e
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Aug 17 19:42:42 2015 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-haskell/package-plan into st3

 packages.txt | 1 -
 1 file changed, 1 deletion(-)

diff --cc packages.txt
index 0416a14,e969f5d..7ee7c29
--- a/packages.txt
+++ b/packages.txt
@@@ -324,20 -318,18 +324,19 @@@ hopenpgp-tools 0.16.2 binary ke
  hostname 1.0
  hothasktags 0.3.3 binary key
  hourglass 0.2.9
- hS3 0.5.9 obsolete
  hs-bibutils 5.5
 -hscolour 1.22
 -hsemail 1.7.2
 -HSH 2.1.2 key # dependency of twidge
 +hscolour 1.23
 +hsemail 1.7.7
 +HSH 2.1.0 key # dependency of twidge
  hslogger 1.2.9
 -hslua 0.3.13
 -Hsmtlib 0.2.0.6
 +hslua 0.4.0
 +HsOpenSSL 0.11.1.1
  hsp 0.10.0
 -hspec 2.1.7 notest
 -hspec-core 2.1.7 notest
 -hspec-discover 2.1.7 notest binary
 -hspec-expectations 0.6.1.1 notest
 +hspec 2.1.10 notest
 +hspec-contrib 0.3.0
 +hspec-core 2.1.10 notest
 +hspec-discover 2.1.10 notest binary
 +hspec-expectations 0.7.1 notest
  hspec-meta 2.1.7 avoid
  hstatsd 0.1
  HStringTemplate 0.8.3

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