Merge branch 'maint'
commit72febd15f38d7fe380cb0c12dc59246f83a8d78e
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 26 Apr 2013 12:14:52 +0000 (26 14:14 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 26 Apr 2013 12:14:52 +0000 (26 14:14 +0200)
tree39268a768db91acedc32188d5f380aea9782afdb
parentc4b6ef830d7483b2d9021e3f331d4b80eb8925c8
parent73b7f3192c6a1ae5cd31636a3b1b22e036717fbb
Merge branch 'maint'