Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 26 Aug 2012 18:58:59 +0000 (19:58 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 26 Aug 2012 18:58:59 +0000 (19:58 +0100)
commit2f2e1a8532941497e86b7d46fa955ac34a1d1da1
treeef692e3d87a85fcd30eabdc49b38c74019229dd3
parentf9df3906c5afb7b3a5de4252d9e4d765cccef4b6
parentfd91a78eabf23ca1f3fe0fd3ff1780dee9e5c606
Merge 0.9->trunk