[DRE-commits] [gitlab] 01/03: Merge branch 'debconf'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository gitlab.

commit f6579beb5229bb073cb1d78297948a93e6442905
Merge: 3c88a26 4368c64
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Jan 23 22:15:53 2016 +0530

    Merge branch 'debconf'

 debian/config           | 10 +++++++++-
 debian/gitlab.templates | 19 +++++++++++++------
 debian/postinst         | 33 +++++++++++++++++++++++++++++----
 3 files changed, 51 insertions(+), 11 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git