Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 11 Jul 2013 14:10:04 +0000 (15:10 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 11 Jul 2013 14:10:04 +0000 (15:10 +0100)
commitd7fe469a519adbf84678d0d716b4c565a77e305d
treea26867acc31fff1f54381958f25cda9fdaa0f51d
parentfa0b9dd4d6a61674563d2d7bd84f39f207f847de
parentdf3d5f1f6cdacf11054744ddbd4ef486060980c5
Merge 0.9->trunk