[monitoring-plugins] Merge branch 'maint'

[Jan Wagner]

 Module: monitoring-plugins
 Branch: master
 Commit: 93071168df90cd71ecb0cd391923cb4cc7de8d3d
 Author: Jan Wagner <w...@cyconet.org>
   Date: Mon Oct  6 10:25:31 2014 +0200
    URL: 
https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=9307116

Merge branch 'maint'

Conflicts:
        NEWS
        THANKS.in

---