Merge branch 'maint'
commit5a14001b5e06c2891a9fd711b25da18ca18d4ab2
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 8 May 2013 08:11:07 +0000 (8 10:11 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 8 May 2013 08:11:07 +0000 (8 10:11 +0200)
tree149b2d528589beaacf27980520d26757d5ec6390
parent69dabd48bcd72bdf047fe7e5491a6b25294e194e
parentbe794a2a308483c44968fdd6b09270224d073595
Merge branch 'maint'