[Pkg-nagios-changes] [pkg-icingaweb2] 03/03: Merge branch 'master' into ubuntu_xenial

[Markus Frosch]

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

lazyfrosch pushed a commit to branch ubuntu_xenial
in repository pkg-icingaweb2.

commit 45c81e2348e8969b8ea127d1057d8eab7c9db6d9
Merge: 4325246 d17f5af
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Mon Aug 8 14:56:42 2016 +0200

    Merge branch 'master' into ubuntu_xenial

 debian/changelog                 |  7 +++++--
 debian/control                   |  6 +++---
 debian/icingaweb2-common.install |  3 +++
 debian/rules                     | 14 +++-----------
 debian/uglify/.gitignore         |  3 +++
 debian/uglify/Makefile           | 41 ++++++++++++++++++++++++++++++++++++++++
 6 files changed, 58 insertions(+), 16 deletions(-)


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