Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 8 Sep 2013 21:26:16 +0000 (23:26 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 8 Sep 2013 21:26:16 +0000 (23:26 +0200)
commit0a8abfba95d65ef7b36508476603349a559ed429
tree9ba69f135e1abe69108f61faa11c153900fbd856
parenta0f40bdfa30d9123ad88a19cb6b87d5409041175
parentd003d56eaf5ffb8c2106ef69cbbc6bbee57b7e00
Merge branch 'maint'