[Pkg-nagios-changes] [pkg-lconf-icinga-mod] 03/04: Merge branch 'master' into debmon-wheezy

[Markus Frosch]

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

lazyfrosch-guest pushed a commit to branch debmon-wheezy
in repository pkg-lconf-icinga-mod.

commit 61a5d0b82b786c85cc06c57aa934c450341bfd7d
Merge: 3998113 1941082
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Apr 15 18:38:32 2014 +0200

    Merge branch 'master' into debmon-wheezy
    
    Conflicts:
    	debian/changelog

 debian/changelog                   |  5 +++--
 debian/patches/property-grid.patch | 43 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index d059f5a,f1abfe8..bfbd850
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,4 +1,11 @@@
 -lconf-icinga-mod (1.3.2-1~preview+1) unstable; urgency=low
 +lconf-icinga-mod (1.3.2-1~preview+0~debmon7+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for debmon-wheezy
 +  * [a4eb6ff] Updated gbp.conf for debmon-wheezy
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Fri, 06 Sep 2013 19:05:48 +0200
 +
- lconf-icinga-mod (1.3.2-1~preview+0) unstable; urgency=low
++lconf-icinga-mod (1.3.2-1~preview+1) UNRELEASED; urgency=medium
  
    * PREVIEW for first official Debian release (Closes: #721994)
    * [31aaf75] Imported Upstream version 1.3.2

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