Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Mon, 21 Nov 2011 11:26:11 +0000 (07:26 -0400)
committerDavid Bremner <bremner@debian.org>
Mon, 21 Nov 2011 11:26:11 +0000 (07:26 -0400)
commitbdf38b5e0fb9674d482c439c1cdb077cd16cdc96
treefca4e1687f14d7e854c4d1eadaaa49d381f0e808
parentcef4075404e093c91e6135802430a46ae97462ed
parenteb88cd977bcfecfc2d4eb16547d21deb839fbae0
Merge branch 'release'