[debian-edu-commits] debian-edu/pkg-team/ 02/03: Merge branch 'master' into debian/stretch/backports

[Mike Gabriel]

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

sunweaver pushed a commit to branch debian/stretch/backports
in repository gosa.

commit 6baf429154e006b8d9bf9872933dcaccdc2c6817
Merge: a8edf00 e7c7f09
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Mar 11 11:43:40 2018 +0100

    Merge branch 'master' into debian/stretch/backports

 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 1bc3992,3cf1e94..abc7844
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ gosa (2.7.4+reloaded3-3) unstable; urgency=medium
+ 
+   * debian/control:
+     + Switch D (gosa-dev) from php7.0-cli to php-cli.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Sun, 04 Mar 2018 20:59:40 +0100
+ 
 +gosa (2.7.4+reloaded3-2~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Thu, 01 Mar 2018 21:32:31 +0100
 +
  gosa (2.7.4+reloaded3-2) unstable; urgency=medium
  
    * debian/control:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git