Merge branch 'master' of ssh://draghi.debian.org/~/dsa-nagios
authorLuca Filipozzi <lfilipoz@emyr.net>
Fri, 13 Feb 2015 19:29:00 +0000 (19:29 +0000)
committerLuca Filipozzi <lfilipoz@emyr.net>
Fri, 13 Feb 2015 19:29:00 +0000 (19:29 +0000)

Trivial merge