[DHG_packages] 04/04: Merge branch 'master' of anonscm.debian.org:/git/pkg-haskell/DHG_packages

[Sven Bartscher]

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

svenb-guest pushed a commit to branch master
in repository DHG_packages.

commit 4d00ec5920a7f8736f7a67b2f439ffcd51e37964
Merge: 7f1b3c2 7d5f13c
Author: Sven Bartscher <sven.bartscher at weltraumschlangen.de>
Date:   Thu Mar 17 18:45:12 2016 +0100

    Merge branch 'master' of anonscm.debian.org:/git/pkg-haskell/DHG_packages

 p/frown/debian/changelog                           |   6 +
 p/frown/debian/patches/01_imagen-creates-png-files |  15 --
 p/frown/debian/patches/04_manual-typos             |  14 +-
 p/frown/debian/patches/06_utf8                     | 222 ---------------------
 p/frown/debian/patches/series                      |   2 -
 p/haskell-http-conduit/debian/changelog            |  12 ++
 p/haskell-http-conduit/debian/control              |   4 +-
 p/haskell-http-conduit/debian/patches/newer-wai    |  13 ++
 p/haskell-http-conduit/debian/patches/series       |   1 +
 p/haskell-http2/debian/changelog                   |   6 +
 p/haskell-http2/debian/patches/series              |   1 +
 p/haskell-http2/debian/patches/stop-using-memcpy   |  55 +++++
 12 files changed, 103 insertions(+), 248 deletions(-)

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