[Pkg-nagios-changes] [pkg-icingaweb2] 02/02: Merge branch 'master' into ubuntu

[Alexander Wirt]

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

formorer pushed a commit to branch ubuntu
in repository pkg-icingaweb2.

commit eda1b91978e6cbed397b79c14ab133d6183029ad
Merge: b8a6839 1b1956d
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Oct 22 06:58:14 2015 +0100

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/control


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