Merge branch 'maint'
commitfa0876fe2ef4b4dfc5101e4a86a1a6e5fc81f6b3
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 20 Aug 2015 19:09:38 +0000 (20 21:09 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 20 Aug 2015 19:09:38 +0000 (20 21:09 +0200)
tree1b060a97d4cf7c4ba6b61a2d92ff2b2682970872
parent41b7c46519d0436e7fee0d465509044a2cef020d
parent1272458926535f140a37461e6155120f5cf45e24
Merge branch 'maint'