Merge branch 'maint'
commita09d968d30d08d5bc3df7d4c4e7ec9adf8af8bf2
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 12 May 2013 15:16:41 +0000 (12 17:16 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 12 May 2013 15:16:41 +0000 (12 17:16 +0200)
treeb41cc2d7669dd5ae37757074dd73bd60ede421b7
parent0ea11e26e46f2f562c1997cf1645dd744d5f6f2f
parent7d37898371de2b6b54af5e127dcefa719b4352da
Merge branch 'maint'