Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 3 Sep 2013 11:32:18 +0000 (12:32 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 3 Sep 2013 11:32:18 +0000 (12:32 +0100)
commit71e249fa42f14d24769961b78bc99a80e0e8684a
tree5c5da73df407493e6bbda275431e3550b8a4ac51
parenteb079a5675a50feebd5c4bb46d65109d18eee926
parentb5f68db2dc2c78f0eda3be475bb431f64f41cad7
Merge 0.9->trunk