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

[Bernd Zeimetz]

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

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

commit 5fdc144d28b52ba8fda83e67b186f001f993e499
Merge: 5fa6fd4 23c7416
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Mon Mar 16 15:18:40 2015 +0100

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

 debian/changelog | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 444a75e,0ae96a5..6f1a058
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,6 +1,12 @@@
- nagios-plugins-contrib (15.20150109~1.gbp803520~bpo80+1) wheezy-backports; urgency=medium
 -nagios-plugins-contrib (15.20141105~1.gbpcb814e) unstable; urgency=medium
++nagios-plugins-contrib (15.20141105~1.gbpcb814e~bpo80+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bernd Zeimetz <bzed at debian.org>  Mon, 16 Mar 2015 15:02:14 +0100
 +
 +nagios-plugins-contrib (15.20150109~1.gbp803520) unstable; urgency=medium
  
-   ** SNAPSHOT build @803520c9300d79ee8552a1f20cdd0b5cbe23dce8 **
+   ** SNAPSHOT build @cb814e21e0460183fb69e124d481487143790bd8 **
  
    [ Evgeni Golov ]
    * [655f77d4] fix check_ipmi_sebsor version

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