[Pkg-nagios-changes] [pkg-icingaweb2] 02/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 4325246cf5c718b16b1f06777e7705594dc7b0e0
Merge: 2528a96 558bf12
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Thu Aug 4 16:26:03 2016 +0200

    Merge branch 'master' into ubuntu_xenial

 ChangeLog                              |  2 +-
 VERSION                                |  2 +-
 application/VERSION                    |  2 +-
 debian/changelog                       | 10 ++++++++++
 icingaweb2.spec                        |  2 +-
 library/Icinga/Application/Version.php |  2 +-
 modules/doc/module.info                |  2 +-
 modules/monitoring/module.info         |  2 +-
 modules/setup/module.info              |  2 +-
 modules/test/module.info               |  2 +-
 modules/translation/module.info        |  2 +-
 11 files changed, 20 insertions(+), 10 deletions(-)

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