Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 8 Apr 2013 14:32:51 +0000 (15:32 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 8 Apr 2013 14:32:51 +0000 (15:32 +0100)
commit8ef9d5fa83b406d55d5a5afa987be74dcd761f95
tree86d7df7f89214df639f0a7e66b086331a7e5dcbc
parentffa0e8a70422324b5b4e1196d4089479527ee228
parent9f78eb48fc60d1508f721d0d6f5334fc124e5013
Merge 0.9->trunk