Merge remote-tracking branch 'upstream/master' 22/head
authorMWilkinson <mark.wilkinson@gamma.co.uk>
Mon, 5 Aug 2013 12:14:53 +0000 (13:14 +0100)
committerMWilkinson <mark.wilkinson@gamma.co.uk>
Mon, 5 Aug 2013 12:14:53 +0000 (13:14 +0100)
commiteda2b50a37c2439013bb02ff525869229bec4253
tree7c17059c93110f6c850b65473f580c9ccdadea38
parent103ed845c525e878a5b2fa82878157d8689443a1
parent18ff3d26559401bd903a87124f61135a122295ab
Merge remote-tracking branch 'upstream/master'

Conflicts:
wwwroot/inc/dictionary.php
ChangeLog
wwwroot/inc/dictionary.php
wwwroot/inc/snmp.php