compile string translation due to '-'in  Australia-Indonesia
Translation
Updated tests to reflect changed flood impact function (polygon hazard): Commit 38486cea5
Updated characterisation test for windows for render checker
Ide updates only
Fixed merge conflict
Resolved merge conflicts
Fix test for map render on ubuntu 12.10
Resolved merge conflicts
Stop tests locking up when docs not present and running show help
Pylint fix
Added shiva to hosts lists in fabfile
Commmmmmmmmma :-)
Fix for failing test in test_dock.test_extentsChanged
Fixed bug in shake map generator whereby incorrect time was calculated
Handle None return from memory check in tests
Disabled extentsChanged mem test
Added note about global attrs pylint warning
In progress fabric task to build docs. See #486
Fix typos in release notes