Merge (some of) trunk -> 0.9
authorMatthew Wild <mwild1@gmail.com>
Thu, 5 Jul 2012 16:41:57 +0000 (17:41 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 5 Jul 2012 16:41:57 +0000 (17:41 +0100)
commitbf94620a78ead8f05c45ffe068888944e5f47568
tree2fdd0e807d4937d1218fb7e92cf1a7857b8ad190
parent5f64aafe69099d98af814930547032787c7aebee
parentb22a1e69d050c21f2581aedc643b309574599807
Merge (some of) trunk -> 0.9