[monitoring-plugins] Merge branch 'check_proc_1203'

[Jan Wagner]

 Module: monitoring-plugins
 Branch: master
 Commit: 25e6f5efafe99517265964c22bf49da74b5ab2de
 Author: Jan Wagner <waja at cyconet.org>
   Date: Tue Oct 13 11:15:20 2015 +0200
    URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=25e6f5e

Merge branch 'check_proc_1203'

(Closes #1371)
(Closes #1203)

---