Merge branch 'maint'
commitd25846b2340e32dea93fc89ea432f74a7f64d950
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 29 Mar 2014 14:02:10 +0000 (29 15:02 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 29 Mar 2014 14:02:10 +0000 (29 15:02 +0100)
tree7d9fc9a39bec986ff5dd210d2ef5e718127bc378
parentf261833a2656239de4bce856ffb79f008bace825
parent91175a31ee73d10f61a57a290dd588fa484be1f2
Merge branch 'maint'