Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 16 Sep 2013 17:41:30 +0000 (18:41 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 16 Sep 2013 17:41:30 +0000 (18:41 +0100)
commitbd602f6c077112e2f0c9125ad9cc6dd646322fec
tree794d26b8415ad730970cac0be4208670250bc51a
parente6242acc7d73044a13afbf99c8e7f1eec65a43e8
parent437e7f4e5c8ba685ae845cc10f97934ac70d2036
Merge 0.9->trunk