Merge branch 'maint'
commit6e40519811288fd124dff835ecdb76fbd174c7a0
authorBastien Guerry <bzg@altern.org>
Sat, 22 Sep 2012 09:08:59 +0000 (22 11:08 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 22 Sep 2012 09:08:59 +0000 (22 11:08 +0200)
treeb3abd73d253edd71921b30ab4c2b6348021fa756
parent59f9e22dda26067caee0bda380f6d1259ed70101
parent1fc19ce5bc127f2f1ab00718f829656daec3b328
Merge branch 'maint'