Merge branch 'maint'
commitc1fceea69ed16358cc551f0a214f5879ebc0fad9
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 6 Dec 2014 21:11:05 +0000 (6 22:11 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 6 Dec 2014 21:11:05 +0000 (6 22:11 +0100)
tree4d6c0027f92281e137e1134790022733adb6ad77
parente2e6a390032e4ee2504cc81aa9d44c1d6990aa0f
parent70b3a76a270c28ecf1d527afb702c6e9fb248b0c
Merge branch 'maint'