Merge branch 'maint'
commite429eb4315d5873de45c282bae0f68b66bc70d9b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 8 Nov 2014 09:19:31 +0000 (8 10:19 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 8 Nov 2014 09:19:31 +0000 (8 10:19 +0100)
tree5da2a3c227fdb2df7ce532798e908142f0b864a6
parent51823c1bb85fc340dfb8afaeacc39bd483437b57
parente80894fcc0ebaa168a81a729fd22616df0026c73
Merge branch 'maint'