Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Sat, 29 Dec 2012 10:47:46 +0000 (11:47 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Dec 2012 10:47:46 +0000 (11:47 +0100)
commit271bbb0a6d038fb295b7ab0ff8d0b3b3275c2e99
tree48bc15d5b1f0c3b70b937beb2db280554f708265
parent42df907d483d36f70e74ab340bd8ffa2319182e5
parente4ca9f44e3e05576df83b91ec88c525903a83ace
Merge branch 'maint'