Merge branch 'maint'
commit61e4f1b2c8fa5198c7af1a8c60c20a2255a5e656
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 16 Oct 2013 11:24:37 +0000 (16 13:24 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 16 Oct 2013 11:24:37 +0000 (16 13:24 +0200)
tree7d299ec223ac4876766dc80317275264bfea54d2
parentfb5003ea6314666a2701e7c5ef689f9370d95209
parentb1e7b86fda3d6a61ae1c3f30439567cf3f5a7ec5
Merge branch 'maint'