Merge branch 'maint'
commitb3224994bf8daa47fa143071e47df41e0f7fe343
authorBastien Guerry <bzg@altern.org>
Sat, 5 May 2012 22:42:29 +0000 (6 00:42 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 5 May 2012 22:42:29 +0000 (6 00:42 +0200)
treea8541ca5048e9bdddfc9f3c31b2782cfd38e05a8
parent212819c5d094d7a33c467c1ec2f2dce53bb1d6c2
parent587b534544a3c631f9a167dfadbd5a511226b1c2
Merge branch 'maint'