[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 01/01: Merge branch 'master' into wheezy-backports

[Bernd Zeimetz]

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

bzed pushed a commit to branch wheezy-backports
in repository pkg-nagios-plugins-contrib.

commit 29d943e69fc34bb794890a0f50389b2c22090b10
Merge: da0137d 53e1b9c
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Mon Mar 16 15:26:42 2015 +0100

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

 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index cd9689c,e4c8ae3..b4b6495
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,4 +1,10 @@@
- nagios-plugins-contrib (15.20150109~1.gbp803520~bpo70+1) wheezy-backports; urgency=medium
++nagios-plugins-contrib (15.20150316~1.gbp803520~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Bernd Zeimetz <bzed at debian.org>  Mon, 16 Mar 2015 15:20:17 +0100
 +
- nagios-plugins-contrib (15.20150109~1.gbp803520) unstable; urgency=medium
+ nagios-plugins-contrib (15.20150316~1.gbpcb814e) unstable; urgency=medium
  
    ** SNAPSHOT build @cb814e21e0460183fb69e124d481487143790bd8 **
  

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