Merge tag 'upstream/0.16'
authorIan Beckwith <ianb@erislabs.net>
Sun, 10 Jun 2012 22:37:15 +0000 (23:37 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sun, 10 Jun 2012 22:37:15 +0000 (23:37 +0100)
commit9004d45c7760030466d6b0f718bf99d20caa2c5a
treebefa7899260ebb349cace6a0b078088157643b0a
parent84ad1da894eebb92b5f60cdb2b58a0b3c3ea9202
parent81c7f1b85cb98976fe96ad4f8a11037b2cb3de35
Merge tag 'upstream/0.16'

Upstream version 0.16