[monitoring-plugins] Merge pull request #1281 from waja/github1218

[Jan Wagner]

 Module: monitoring-plugins
 Branch: master
 Commit: ee7b68050c806c4ceaebabdbf84b741319caacf7
 Author: Jan Wagner <waja at cyconet.org>
   Date: Wed Jul 30 15:39:39 2014 +0200
    URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=ee7b680

Merge pull request #1281 from waja/github1218

---