Merge branch 'maint'
commitf5e478a401b846318dec9cee2b664a91d0d9a07d
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 14:57:17 +0000 (8 15:57 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 14:57:17 +0000 (8 15:57 +0100)
tree7cdf368ff9d3b859d2d2bb327547832d07ada18e
parent679dce0fda64e566f6a4106ec11aa090cdbc28df
parenta4b41431327c89392066f76910fd3af8e8b5d13a
Merge branch 'maint'