Merge branch 'maint'
commit45abec0b59c763d3d53f3eb52080cb9cf44b446f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 25 Aug 2015 13:04:59 +0000 (25 15:04 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 25 Aug 2015 13:04:59 +0000 (25 15:04 +0200)
treefb0f6563e8f8c3fa6a97af61f2b619a90ba32d12
parentbed2caf56fa1338fc157547aedf35c3da4c6331c
parent88f7da8db37b18e87839dce22ff9999caf4d3d24
Merge branch 'maint'