Merge branch 'maint'
commit352118bf7fd2b8b1ef254545138ec105ab3991cf
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 13 Oct 2014 16:16:04 +0000 (13 18:16 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 13 Oct 2014 16:16:04 +0000 (13 18:16 +0200)
tree6b206eddc384bb21e4da2e3267b8484947d1bbd2
parent3d690a6a11e7e65f040c9904d81201202eb024ed
parentfdd9b18598239dd0e8b18383ac930110d51ed22e
Merge branch 'maint'