Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 15 Apr 2013 15:43:08 +0000 (16:43 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 15 Apr 2013 15:43:08 +0000 (16:43 +0100)
commit6d83e97d20ea845369fb380e26f2293e45b9d4e8
tree7edbbe9f57d3be8218a83ea66ed3f5f6e6493bcf
parent9e54f2aa654ee178fef9a9dfb533ed63e1fb21e3
parentcca1450f324af84b8946c6812c1d4c49f6d0ffe7
Merge 0.9->trunk