Merge branch 'release-0.10'
authorAndrew Ruthven <puck@catalyst.net.nz>
Thu, 4 Dec 2014 21:27:44 +0000 (10:27 +1300)
committerAndrew Ruthven <puck@catalyst.net.nz>
Thu, 4 Dec 2014 21:27:44 +0000 (10:27 +1300)

Trivial merge