Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 29 Sep 2012 09:47:37 +0000 (10:47 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 29 Sep 2012 09:47:37 +0000 (10:47 +0100)
commit4924e9c5e5eba6ba68489f9af495172f4efff016
tree1e9cccb0c5ae5208acacdc9abee191ee0d019137
parent5b982fb9673d347746533db2d2f0cbbc69547f36
parente0d9a28abd8df79407447a2b0a327332de1dfced
Merge 0.9->trunk