Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 14 May 2013 08:39:32 +0000 (09:39 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 14 May 2013 08:39:32 +0000 (09:39 +0100)
commita16fb077c62b35c16d4e9b2412e4bc2c29ae3c49
tree235556d18151470740daa483d350aff70dfca8a4
parent5708de632055001445a24f1473895a26b1beefb4
parentc580086f6f442f4252aea6a4e9abd5ab5d6d255f
Merge 0.9->trunk