Merge branch 'maint'
commit087e51a5d3cc04323cb83618cf11623136e2b093
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 11 Sep 2013 15:13:46 +0000 (11 17:13 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 11 Sep 2013 15:13:46 +0000 (11 17:13 +0200)
tree7a98e5a880b2262900c811909ced6c1b63ac7c27
parent44c5aa7315aad1d4649910d41437aa21831e690a
parent7b4d8bb614552ff4665825ed6aa36905c4a48514
Merge branch 'maint'