Merge branch 'maint'
commit83465dfda17dc79b535b4647cbc93528bfc344df
authorBastien Guerry <bzg@altern.org>
Mon, 14 May 2012 15:10:19 +0000 (14 17:10 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 14 May 2012 15:10:19 +0000 (14 17:10 +0200)
treea1ae60f7ae80bf7d75ff4f102073c49407087fa4
parent323836f0ff6b288f4a93071fef5f6df7896d20a0
parentc50f0c78d8132f71ebb9e1b9af7d288077f95bcf
Merge branch 'maint'