Merge branch 'maint'
commitb37b95724c6a519106adb8b39ce275ffa70938aa
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 27 Aug 2012 09:22:47 +0000 (27 11:22 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 27 Aug 2012 09:22:47 +0000 (27 11:22 +0200)
tree49e471f9bcc8356a0e8c26e995397b6d7426c72f
parentab744c2dc39096687190bb21505a9808f3e37275
parent40084a55d16775519bf7960a7d583894fb606450
Merge branch 'maint'