Merge branch 'maint'
commitf37f3596a26758760518942098ea4b93b43ecaf2
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 13 Oct 2013 16:21:14 +0000 (13 18:21 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 13 Oct 2013 16:21:14 +0000 (13 18:21 +0200)
treeebfaec0fc115fc18a545d4b1f0f08a8b3db930f1
parentfd5a4f7d3660ff1a9102eaf6d825a5a60c982d9c
parent92c2ccb1fb438064453c60ff215adad1c213218d
Merge branch 'maint'