Merge branch 'maint'
commit60ca9e782b111bb9ade949141aa6cce11a1dde87
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 28 May 2013 08:49:44 +0000 (28 10:49 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 28 May 2013 08:49:44 +0000 (28 10:49 +0200)
treebde56a3598f047180ce193cb5b0d81c0c3b87177
parent26a9b0248385e17ae611a34cbdc991d759251afa
parentd3f9b1cb7bd9c74b520855a749637b3816716d89
Merge branch 'maint'