Merge branch 'release-0.10'
authorAndrew Ruthven <andrew@etc.gen.nz>
Thu, 4 Dec 2014 21:19:03 +0000 (10:19 +1300)
committerAndrew Ruthven <andrew@etc.gen.nz>
Thu, 4 Dec 2014 21:19:03 +0000 (10:19 +1300)
commit67b515da9ecfe5fb88585208198902e7dd64c8c9
tree09ec9c6c103a898ba7d7ea8610f733c66a6a77be
parent56645e8fb7192c725d96287bd0c61e19af0460ab
parent98c1da355e6fbbff0674a1d08f0eef92fc338278
Merge branch 'release-0.10'