Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 8 Jul 2012 17:54:56 +0000 (18:54 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 8 Jul 2012 17:54:56 +0000 (18:54 +0100)
commitdc5ee3badc373c01cdab748392b62358258c2de3
tree0011aba7004edbbc166f31cbcd3766d8302bd54c
parentc7db4b9b2d7a6876a2302d1b6fd5f1d2fff61e08
parent87322dba7bec7a32ace681561cf5a7f6fc0b5173
Merge 0.9->trunk