Merge branch 'maint'
commit46ad4b561e191d097220c8e24d98ceb9c44caa8f
authorBastien Guerry <bzg@altern.org>
Wed, 22 Jan 2014 16:11:06 +0000 (22 17:11 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 22 Jan 2014 16:11:06 +0000 (22 17:11 +0100)
tree20397bcfbd90c0fd253eb957b5f065a026378dcf
parent0b67b7e28379fc4ccf7455c387adec9a597ee3dc
parent91940f514e436254336990f9bfc0d25da4528fd0
Merge branch 'maint'