Merge branch 'maint'
commit1b06c10e2c13ca49f2c7b0d568f647c217b94257
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 4 Mar 2012 14:55:41 +0000 (4 15:55 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 4 Mar 2012 14:55:41 +0000 (4 15:55 +0100)
treeebd19e0427c1c7a199e4b71d6c8def6782dc601e
parentf18ea108aac35554a675bae46580daf2edd0ab09
parentf1a99ceddf37c2e30106dd35ff29e1ea4bce6f90
Merge branch 'maint'