Merge branch 'maint'
commitc1581d0ab45247bf83696df65df653ed4010fe97
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 17 Sep 2013 20:38:15 +0000 (17 22:38 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 17 Sep 2013 20:38:15 +0000 (17 22:38 +0200)
tree81f5fdbb4cd8a978153054dd9383e0cb44ed0cac
parent3f177965ee606a64e6fb6cc948a12f8f5a0290c4
parent072f2abe4cdb57d01262e28858330f1e22de5e6f
Merge branch 'maint'