Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 24 Jun 2013 17:29:04 +0000 (18:29 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 24 Jun 2013 17:29:04 +0000 (18:29 +0100)
commit85563052480d9d50103dc127e10c00d43beb72b5
tree15d0971b6a748c2c381b0b50c9fa4ad870e29520
parentfc3e494da546f3799cc5ed1d4d613a93e9f1ca7b
parent41f298aa238c393b692d912047ceb11d0cdc67e9
Merge 0.9->trunk