Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 18 Jun 2013 11:17:06 +0000 (12:17 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 18 Jun 2013 11:17:06 +0000 (12:17 +0100)
commit390fd286be76753698cd86e2e5d283015248a068
tree5a527c094ad3c432a394058f40be98abbab52ab8
parent6e0824447005c2bdb5335e6b7071ae7e5cf20ab2
parentfd7252ae16bf03a7e81639745042dd9b2040975e
Merge 0.9->trunk