Merge branch 'maint'
commit29ab1bb74ef2b0fc81cabc113cebb5e1c2ef8466
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 7 May 2013 15:49:01 +0000 (7 17:49 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 7 May 2013 15:49:01 +0000 (7 17:49 +0200)
tree70c58c2d65f75b9d43e0b27a5fd9e03791fa62fc
parenteceb2ff7d118b57b102cef373947f9d087136b86
parentbd27a005bb9ddc547de5e08722f2f15df7d48e49
Merge branch 'maint'