Merge branch 'maint'
commit82019bc7c7a786303e82cfa5891193acb3754606
authorBastien Guerry <bzg@altern.org>
Sat, 17 Mar 2012 14:56:43 +0000 (17 15:56 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 17 Mar 2012 14:56:43 +0000 (17 15:56 +0100)
tree6f3da41a0f77efbddf018ab841a2e046dd9a41b1
parent49dd6de08384f913f014ac06c24da4ff08ccdb6a
parentf2acf329cb1ae43a6a54f8f150c136315a606ca2
Merge branch 'maint'