Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 8 Apr 2013 11:08:34 +0000 (12:08 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 8 Apr 2013 11:08:34 +0000 (12:08 +0100)
commitf9de78f5f52b54c363536a5791ba3f75689f77f7
treebfbb4087bbcfc4e7db8e968dff1722051f50635f
parentcc56df0ce28ec6173ef29eed57060108c32b0fab
parenta4fd3f86a87b1da5c72a8bbec6b848b4c0a644fa
Merge 0.9->trunk