Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 29 Jun 2013 09:11:55 +0000 (10:11 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 29 Jun 2013 09:11:55 +0000 (10:11 +0100)
commit00b1cf077c52d45336ae6194a706410b3b03db34
treeeed76142b3f4d922cd39d7f5b886378b3ef58898
parentfb4d2179c4432d5e18f74758c37cdf125ee2c211
parent98422859b1320f9344fd4eedb1abbfdbe2a3739d
Merge 0.9->trunk