Merge branch 'maint'
commit06b94ca884733eaefb0ec868d641da78ed536ceb
authorBastien Guerry <bzg@gnu.org>
Fri, 16 Mar 2012 19:05:59 +0000 (16 19:05 +0000)
committerBastien Guerry <bzg@gnu.org>
Fri, 16 Mar 2012 19:05:59 +0000 (16 19:05 +0000)
treedab13dcf281f2e802572efac1b6c9317066040dd
parent7e903acccdadcaebff16bc7fdfd4e89482c6632b
parent78ec8e21b8a5c72797c108621ae18c89e92a3dab
Merge branch 'maint'