[package-plan] 01/01: Merge branch 'master' into st3 to reflect merge in package repository.

[Sven Bartscher]

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

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

commit ec161ddd5de948f98ddbad557b8c33c3d386bf4c
Merge: ea4de6d dfe686b
Author: Sven Bartscher <sven.bartscher at weltraumschlangen.de>
Date:   Mon Aug 17 14:54:57 2015 +0200

    Merge branch 'master' into st3 to reflect merge in package repository.

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

diff --cc packages.txt
index ea4107f,2290d81..b1c64ca
--- a/packages.txt
+++ b/packages.txt
@@@ -319,8 -313,8 +319,8 @@@ hmatrix 0.16.1.
  hoauth 0.3.5 obsolete
  hoauth2 0.4.8
  hoogle 4.2.41 notest
- hOpenPGP 2.1
- hopenpgp-tools 0.15 binary
 -hOpenPGP 2.2.1 ahead
 -hopenpgp-tools 0.16.2 binary ahead
++hOpenPGP 2.2.1 key
++hopenpgp-tools 0.16.2 binary key
  hostname 1.0
  hothasktags 0.3.3 binary key
  hourglass 0.2.9

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