Merge branch 'maint'
commit2def186601a7ea411ef474b5c69f8c3031be2f2c
authorBastien Guerry <bzg@altern.org>
Sat, 5 May 2012 22:49:19 +0000 (6 00:49 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 5 May 2012 22:49:19 +0000 (6 00:49 +0200)
treea8541ca5048e9bdddfc9f3c31b2782cfd38e05a8
parentb3224994bf8daa47fa143071e47df41e0f7fe343
parentf6745ff2d013e23d257ea2cbbbe18e5843d4ac6a
Merge branch 'maint'