Merge branch 'maint'
commitba6992888763522cb5d84e5ca3751d79ebd63fc9
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 6 Aug 2015 13:39:28 +0000 (6 15:39 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 6 Aug 2015 13:39:28 +0000 (6 15:39 +0200)
tree0b36d878715367977f8e64feecccc9e1bc67185c
parentba6d489321d53201531d4ce77e6e1d9e25c1cf56
parent3a632fa201b782faa61b994572bbe2bdc2b85110
Merge branch 'maint'