Merge branch 'maint'
commitf3ae90c6c53080a2a77a0c3079263de8c57104e2
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 23 Oct 2013 16:29:06 +0000 (23 18:29 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 23 Oct 2013 16:29:06 +0000 (23 18:29 +0200)
tree6885bd8259c365fd86dd9cf32ca07c74a51be9c3
parenta24775dc7932ff840c6949f966331a769f0377e6
parent0113f4f80fc1d084f2d0dfff673c32e32a923c53
Merge branch 'maint'