[Pkg-nagios-changes] [pkg-icingaweb2] 01/01: Merge branch 'master' into debmon-jessie

[Alexander Wirt]

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

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

commit 52a42ea225dec5740a62524a51fc9dac55677b30
Merge: 996eb82 1ac087d
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Nov 18 11:54:41 2015 +0100

    Merge branch 'master' into debmon-jessie

 debian/changelog                | 11 +++++++++--
 debian/patches/10_html_purifier | 26 ++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 58c9b08,93c0cdb..6d9d4aa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,15 @@@
- icingaweb2 (2.1.0-1~debmon80+1) debmon-jessie; urgency=medium
++icingaweb2 (2.1.0-2~debmon80+1) debmon-jessie; urgency=medium
 +
 +  * Rebuild for debmon-jessie
 +
-  -- Markus Frosch <lazyfrosch at debian.org>  Mon, 16 Nov 2015 16:47:50 +0100
++ -- Alexander Wirt <formorer at debian.org>  Wed, 18 Nov 2015 11:54:29 +0100
++
+ icingaweb2 (2.1.0-2) unstable; urgency=medium
+ 
+   [ Markus Frosch ]
+   * [ac348b1] Add patch for HTMLPurifier path loading
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 18 Nov 2015 11:53:08 +0100
  
  icingaweb2 (2.1.0-1) unstable; urgency=medium
  

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