Merge branch 'maint'
commit0b67b7e28379fc4ccf7455c387adec9a597ee3dc
authorBastien Guerry <bzg@altern.org>
Wed, 22 Jan 2014 10:44:59 +0000 (22 11:44 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 22 Jan 2014 10:44:59 +0000 (22 11:44 +0100)
tree98507e3e4d96e0a236f82976901764937ef8c975
parent410b6a65f9e8ddebc0a4d1dc3a98c2eb7d99f5ee
parent77458b782ae8a96376817ea010adcf499d554e1c
Merge branch 'maint'