[monitoring-plugins] Merge remote-tracking branch ...

[Holger Weiss]

 Module: monitoring-plugins
 Branch: master
 Commit: e260efb25690b13002a0bf432507f66bdad90f02
 Author: Holger Weiss <holger at zedat.fu-berlin.de>
   Date: Fri Feb 28 13:22:34 2014 +0100
    URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=e260efb

Merge remote-tracking branch 'awiddersheim/fix_trusted_path'

* awiddersheim/fix_trusted_path:
  Fix trusted path

Conflicts:
	plugins-scripts/check_ntp.pl
	plugins-scripts/subst.in

Closes #1212.

---