Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 1 May 2013 12:45:42 +0000 (13:45 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 1 May 2013 12:45:42 +0000 (13:45 +0100)
commit9e59c7ae139d34932454cd6e3921c70c1b978fd9
treed131c25f447df635294ec1b624726ee21ff0e04e
parent4aa069c3ca4cb9ea510880c548bdf625f08f297b
parentb11cb25a07602b016eedf79d238a8ce5e9b3c161
Merge 0.9->trunk