Merge branch 'maint'
commita685acc9e32568422223b3e4b29b33b171a08ce0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 16 Mar 2016 21:37:10 +0000 (16 22:37 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 16 Mar 2016 21:37:10 +0000 (16 22:37 +0100)
treeb2c7f07ef3a30e4d0bb3d6c6ad8783bf6497bcc7
parent99e12cbf92e669a7e8c49264df5f087064016c2e
parent9879c20a34be0d856466893d44203592f93ba5ca
Merge branch 'maint'