[monitoring-plugins] Merge remote-tracking branch 'upstream/master'

[Greg Cox]

 Module: monitoring-plugins
 Branch: master
 Commit: 4273dd06ff3e52094d6b267d00e8c51dd74de364
 Author: Greg Cox <gcox@fibbsbozza.local>
   Date: Tue Jul 29 18:52:12 2014 -0400
    URL: 
https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=4273dd0

Merge remote-tracking branch 'upstream/master'

Conflicts:
        plugins/netutils.c

---