Added Cisco 3012 Switch module for IBM blade center (#871)
Added Catalyst WS-C3524T-XL-EN switch (#751)
Added Cisco AS5350 Universal Gateway (#777)
fixed indentation of wwwroot/inc/dictionary.php
Fixed indentation in ChangeLog
Added Cisco 3012 Switch module for IBM blade center (#871)
Merge remote-tracking branch 'upstream/master'
update to snmp.php - remove unneeded processors
Added Cisco Catalyst WS-C3560-8PC (#975)
Added Cisco C2950-12 (#973) to SNMP sync
SNMP sync for Cisco WS-C2950G-24-DC (#981)
Reordered known_switches array to remove duplicated
  (9.1.559 + 9.1.1007 & 9.1.1316)
$known_switches array now in numerical order
Merge remote-tracking branch 'upstream/master'

Conflicts:
	wwwroot/inc/dictionary.php
Merge pull request #22 from MWilkinson/master

Updates to SNMP sync code for Bugs #871/#975