[monitoring-plugins] Merge pull request #1261 from sni/master

[Sven Nierlein]

 Module: monitoring-plugins
 Branch: master
 Commit: 7508da9360a77c6799e74a8109b768a1b8fbba11
 Author: Sven Nierlein <sven at nierlein.org>
   Date: Tue Jun 24 15:08:41 2014 +0200
    URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=7508da9

Merge pull request #1261 from sni/master

tests: always build and test on travis

---