Merge branch 'maint'
commitab744c2dc39096687190bb21505a9808f3e37275
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 27 Aug 2012 07:11:39 +0000 (27 09:11 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 27 Aug 2012 07:11:39 +0000 (27 09:11 +0200)
treed9155a9efff5bbb149a0674d081b3028cb8a153f
parentf29660fe7a28333e112eb1f48e834527d60261ee
parent805a9f019d455e64c1b0d0f54aa8161cb0bbbe28
Merge branch 'maint'