Merge branch 'maint'
commit44c6475fdecdbf4e47931dace5a14e159a34d88e
authorBastien Guerry <bzg@gnu.org>
Mon, 12 Dec 2011 23:24:11 +0000 (12 23:24 +0000)
committerBastien Guerry <bzg@gnu.org>
Mon, 12 Dec 2011 23:24:11 +0000 (12 23:24 +0000)
tree569a8a6d58aa7a030e4acc28385c9603b78a49c3
parent9d51ba9b13b4bb1fcfbed458e07fd79a3d87ddf6
parent96bfadd67c671509807a07921ef8702ef6545c89
Merge branch 'maint'