Merge branch 'maint'
commit363fd7e8f340a1d8c30276922571614075067e37
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 20 Jan 2014 16:26:12 +0000 (20 17:26 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 20 Jan 2014 16:26:12 +0000 (20 17:26 +0100)
treefc47ea747dc30ed99d3b191654534a218157b9b6
parente5617b88cbe420b706548ca058e0a5c64f15bcd3
parentb79462ba989e57f83c2d701c2f3e595599a2b40e
Merge branch 'maint'