Merge branch 'release-0.10'
authorAndrew Ruthven <andrew@etc.gen.nz>
Thu, 21 Nov 2013 10:07:17 +0000 (23:07 +1300)
committerAndrew Ruthven <andrew@etc.gen.nz>
Thu, 21 Nov 2013 10:07:17 +0000 (23:07 +1300)

Trivial merge