Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Sat, 10 Sep 2011 13:11:25 +0000 (10:11 -0300)
committerDavid Bremner <bremner@debian.org>
Sat, 10 Sep 2011 13:11:25 +0000 (10:11 -0300)
commitc35ac0bdbd51ddc606cbeb35e8b7b86e450b4b74
tree4b5ea2f42af46b5de6a97bf471f422cc812f877a
parenta6b93ef32b3274f0ae51acc336500a439371d0fc
parentb824877c4391b738205904f0bd3ec8ec3b87d136
Merge branch 'release'