[DHG_packages] 02/03: Merge branch 'master' into jessie-backports

[Joachim Breitner]

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

nomeata pushed a commit to branch jessie-backports
in repository DHG_packages.

commit 987fb545d16fb9fbbbbf6439e3c4bf80a2b1582a
Merge: 89c57b1 718a276
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Jan 18 18:28:59 2016 +0100

    Merge branch 'master' into jessie-backports

 p/ghc/debian/changelog                             |   4 +-
 p/haskell-cabal/debian/changelog                   |  10 ++
 .../debian/patches/cabal-show-detail-direct.patch  | 103 +++++++++++++++++++++
 p/haskell-cabal/debian/patches/series              |   1 +
 4 files changed, 116 insertions(+), 2 deletions(-)


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