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

[Holger Weiss]

 Module: monitoring-plugins
 Branch: pu
 Commit: 6c0828453712c977a856c635a1a6586c351f1bd0
 Author: Holger Weiss <holger at zedat.fu-berlin.de>
   Date: Fri Feb 28 09:58:22 2014 +0100
    URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=6c08284

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

---