Merge branch 'maint'
commitbfcb7f1abc54aeadcc761370c9809f32a629694a
authorBastien Guerry <bzg@altern.org>
Sat, 18 Feb 2012 10:48:52 +0000 (18 11:48 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 18 Feb 2012 10:48:52 +0000 (18 11:48 +0100)
treeed05f0fff4e459ef8c74daeb73177cffd7493f3c
parenteed72c5556b55d8d072b09a90652052cca4f4788
parent51923ff2bcfb5c441ed9c10635fe0160589c0ba5
Merge branch 'maint'