Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 3 Apr 2013 12:53:21 +0000 (13:53 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 3 Apr 2013 12:53:21 +0000 (13:53 +0100)
commit27afa11d9c7637166d9241ab06b4a648b3046a91
treee21562a98aa73a5895e03e714ef7339478d6f5a6
parent966d46dc225201a176c226287e91bfb5b0700f47
parentd6023d7e8efdee263d85e1fa3f864e93a451ed35
Merge 0.9->trunk