Merge branch 'maint'
commitbe3362e7e0ce27f563e07ee61047d11a9412fc61
authorBastien Guerry <bzg@gnu.org>
Tue, 13 Dec 2011 00:34:34 +0000 (13 00:34 +0000)
committerBastien Guerry <bzg@gnu.org>
Tue, 13 Dec 2011 00:34:34 +0000 (13 00:34 +0000)
tree7c7f317db42bc833d6663f2d8071cf72fe4dbc34
parentef3d83d0cfe64b076a14344a02aa21cf12523a47
parente857b738c6ee9227438d3070e408c9bcad6ab8a1
Merge branch 'maint'