Merge branch 'maint'
commit22ee29b5ef24a863593d656e0b287901c9dd1c2c
authorBastien Guerry <bzg@altern.org>
Thu, 13 Dec 2012 16:04:48 +0000 (13 17:04 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 13 Dec 2012 16:04:48 +0000 (13 17:04 +0100)
tree4f625a93eafe6ba7e432b54325b73fdcf08adc07
parent5c1eab535bca9b15da76c2644d5d7f7bfc5fbcd3
parent7a770c10c142dae5e585c529c2232affbc313585
Merge branch 'maint'