Merge branch 'develop'
Version bump + dch
Merge branch 'develop'
Version bump + dch
Merge branch 'master' into develop
Give back OK on a smart test, if the appropriate MegaRaid disk is spun down
Minor changes on nagios/plugins/check_smart_state.py
Merge branch 'develop' of ssh://git.pb.local/srv/git/python/nagios-plugin into develop
Merge branch 'develop'
Version bump + dch
Merge branch 'master' into develop