Merge branch 'maint'
commitc262dd7f14a3c8c51ea3d495b7388bf641e90e9e
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 14 Dec 2014 08:33:28 +0000 (14 09:33 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 14 Dec 2014 08:33:28 +0000 (14 09:33 +0100)
tree614c4cd2b52fb191c8e9ee4bc516ff8d2b15c368
parent94c1099dab23ec435a19adb8553de58220d93d6e
parentc6a4116c62630a02b8a394c29daa99ef87a4cf8a
Merge branch 'maint'