[DHG_packages] 02/02: Merge remote-tracking branches 'origin/master' and 'origin/st3' 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 27fd9642c0b5d808066b71e6d964d785d6508e7f
Merge: 1b6e4bd 2d6b05d 41841da
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Aug 17 20:09:36 2015 +0200

    Merge remote-tracking branches 'origin/master' and 'origin/st3' into st3

 p/ghc-mod/debian/changelog                         |   6 +
 p/ghc-mod/debian/control                           |  52 +-
 p/ghc-mod/debian/rules                             |   2 +-
 p/haskell-cabal-helper/debian/changelog            |   5 +
 p/haskell-cabal-helper/debian/compat               |   1 +
 p/haskell-cabal-helper/debian/control              |  99 +++
 p/haskell-cabal-helper/debian/copyright            | 714 +++++++++++++++++++++
 .../debian/haskell-cabal-helper-utils.install      |   1 +
 p/haskell-cabal-helper/debian/rules                |   9 +
 p/haskell-cabal-helper/debian/source/format        |   1 +
 p/haskell-cabal-helper/debian/watch                |   2 +
 p/haskell-yaml/debian/changelog                    |  13 +
 p/haskell-yaml/debian/control                      |  12 +-
 p/haskell-yaml/debian/rules                        |   2 +-
 14 files changed, 906 insertions(+), 13 deletions(-)

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