Merge branch 'maint'
commit3f71612fb7207a1b9ce3419173adf2ce7f22e9a5
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 18 Sep 2013 19:17:52 +0000 (18 21:17 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 18 Sep 2013 19:17:52 +0000 (18 21:17 +0200)
treeab71d0ad91fea8d2de6f42a69e8cc3275c0a4e2d
parentc1581d0ab45247bf83696df65df653ed4010fe97
parent41cf6f2a3687a6edeccb9171e056d2017b17f7df
Merge branch 'maint'