Merge branch 'maint'
commit4bf9a53cde29b6024062d5d7ab63eb5ac199ee0e
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 16 Oct 2013 19:29:16 +0000 (16 21:29 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 16 Oct 2013 19:29:16 +0000 (16 21:29 +0200)
treea4448327168c141d281bfe36d944cedd1aaf5e18
parent61e4f1b2c8fa5198c7af1a8c60c20a2255a5e656
parent5394f15e51af7aa28611b6a9c69e8b2dcdf6f98d
Merge branch 'maint'