Merge branch 'maint'
commit240329465b466584f4bf80f24eb881fb3c9285cf
authorBastien Guerry <bzg@altern.org>
Fri, 24 Jan 2014 10:26:53 +0000 (24 11:26 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 24 Jan 2014 10:26:53 +0000 (24 11:26 +0100)
tree79c053c4ec2e463d4d3468985585405faed29890
parentd1897eed7aa8cc278e2208d39aa15daac6ae4c96
parentcaf851d44dd6c8d8338df956b385a5965bae19ca
Merge branch 'maint'