Merge branch 'maint'
commit10cb9d7323ae6b2c7e367c0171efdcd7115b5f63
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 14 Aug 2015 14:23:07 +0000 (14 16:23 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 14 Aug 2015 14:23:07 +0000 (14 16:23 +0200)
tree40ca4c25aa54f02c2cc8bb4f86fc3a76a7b0034c
parent97d43ff681c54766593a67a5d1f48426db884865
parent6a0454e4f053353a18687186e0fd93b9a6d78748
Merge branch 'maint'