Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Wed, 23 Nov 2011 20:02:47 +0000 (16:02 -0400)
committerDavid Bremner <bremner@debian.org>
Wed, 23 Nov 2011 20:02:47 +0000 (16:02 -0400)
commitb5803e918dbf772536de2bd1017e8888c01bd5a9
tree461d79d97157f76b4df1884d2f6a71c10843a270
parenta467c5f071a1a730adc2bd84635dfc608c26ace9
parent9fbc912cc98cfd3977a5ce419ae88948abf8158f
Merge branch 'release'