Merge branch 'maint'
commit5e63baf92ee767451a5fc8d0d5f3a200a4645cb9
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 2 Jan 2016 16:06:53 +0000 (2 17:06 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 2 Jan 2016 16:06:53 +0000 (2 17:06 +0100)
tree2e7215cf59606579650b5015f6acc85fd73e27ec
parent8bc5d40264cb7d0ef7c3538edc82bdf40f5dcc55
parent59f00529d4d589a8e3a537024247430fba7aa85f
Merge branch 'maint'