Merge branch 'maint'
commit99c8732bf89a55b50dba6262ef16a43c5222e59f
authorBastien Guerry <bzg@altern.org>
Tue, 25 Dec 2012 02:29:29 +0000 (25 03:29 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 25 Dec 2012 02:29:29 +0000 (25 03:29 +0100)
tree4afe0f0b7d88a2fc8bf790a2104ceda8ca61f44d
parenta04ccc40b2924a7afc99c6b414ae394e1affdfdb
parent6671e80453590ec82ec18c1343ce4829f523af2d
Merge branch 'maint'