Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 22 May 2013 13:33:18 +0000 (14:33 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 22 May 2013 13:33:18 +0000 (14:33 +0100)
commit2d8c1bb0bef34f6dc4377734d1143524f6994167
treef2bb90ac44254624f15893923eadd55a6eade962
parentf846760305fb4ba45f9e2a475fc1a3a4d3bc7f21
parent573e7fd21a47c1c67f319887dedaac15913b6a39
Merge 0.9->trunk