Merge branch 'maint'
commitdbe69f26aa5930368774d29c979bd7cd3c10e50c
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 4 Mar 2012 15:40:43 +0000 (4 16:40 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 4 Mar 2012 15:40:43 +0000 (4 16:40 +0100)
treedaf9d4fa51745db8e09238a83ae2463512bd9f0b
parent1b06c10e2c13ca49f2c7b0d568f647c217b94257
parentb549c6006511150a93bb97a539d400ab3ade4b75
Merge branch 'maint'