massive formatter re-work
authorTony Cook <tony@develop-help.com>
Sun, 3 Nov 2013 23:27:01 +0000 (10:27 +1100)
committerTony Cook <tony@develop-help.com>
Sun, 3 Nov 2013 23:27:01 +0000 (10:27 +1100)

Trivial merge