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

[Joachim Breitner]

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

nomeata pushed a commit to branch master
in repository DHG_packages.

commit fc94d35d42cfdb22242bad41ab51efcfd4dd8674
Merge: 8e62913 8fca798
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Jun 23 16:39:04 2016 +0100

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

 p/gitit/debian/changelog                   | 14 ++++++++++++++
 p/gitit/debian/control                     | 10 +---------
 p/gitit/debian/libghc-gitit-data.links     |  4 ++++
 p/gitit/debian/libghc-gitit-data.linktrees |  4 ----
 p/gitit/debian/patches/jquery.patch        |  4 ++++
 p/gitit/debian/rules                       |  1 -
 p/gitit/debian/source/lintian-overrides    |  2 --
 7 files changed, 23 insertions(+), 16 deletions(-)

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