Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 26 Jun 2013 20:40:33 +0000 (21:40 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 26 Jun 2013 20:40:33 +0000 (21:40 +0100)
commitfb4d2179c4432d5e18f74758c37cdf125ee2c211
treecfca4f37949686b5843057b6191b35f7721a83e4
parent203a1984b2d74adf226e49d401ee0cc483a784a4
parent1d89ef70547703ae64a530d3e03b46cd17c3d9ed
Merge 0.9->trunk