[DHG_packages] 99/101: Merge branch 'master' 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 DHG_packages.

commit 0490c5144c286e2ce32e55819f1ad1a81feab29b
Merge: 77c4949 e6628ea
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Aug 16 15:17:41 2015 +0200

    Merge branch 'master' into st3

 p/haskell-hopenpgp-tools/debian/changelog | 12 ++++++++++++
 p/haskell-hopenpgp-tools/debian/control   |  4 ++--
 p/haskell-hopenpgp/debian/changelog       |  6 ++++++
 p/haskell-hopenpgp/debian/control         |  9 ++++++---
 4 files changed, 26 insertions(+), 5 deletions(-)

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