Merge branch 'release-0.10'
authorAndrew Ruthven <andrew@etc.gen.nz>
Thu, 4 Dec 2014 21:06:15 +0000 (10:06 +1300)
committerAndrew Ruthven <andrew@etc.gen.nz>
Thu, 4 Dec 2014 21:06:15 +0000 (10:06 +1300)
commit56645e8fb7192c725d96287bd0c61e19af0460ab
tree036100683ff05b88cb36317af82783e4d4091207
parent5fce87bea549b4b76a74cd5f66b44d4b822f7501
parent000290f32d26d6e4f1f5e93226f137fb3ff546d6
Merge branch 'release-0.10'

Conflicts:
ChangeLog
ChangeLog