Merge branch 'maint'
commit1ee1dc553463062605df7eb49a013a1cf0d3951e
authorBastien Guerry <bzg@gnu.org>
Mon, 12 Dec 2011 17:08:27 +0000 (12 17:08 +0000)
committerBastien Guerry <bzg@gnu.org>
Mon, 12 Dec 2011 17:08:27 +0000 (12 17:08 +0000)
tree338bc79946a6d7b7297ac37f439ecd3b4f3b7326
parente56e2c8760dc6537414c21cd629de0735a44c676
parentc53eb54a5297844687ebd08884605b7926130256
Merge branch 'maint'