Merge branch 'maint'
commitb4ff6d972764568ad33493ecb1b9a8951ea4b471
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 15:34:38 +0000 (8 16:34 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 15:34:38 +0000 (8 16:34 +0100)
tree27e3d03795612592bd7f6dc2b4f1fdffbc4ee9c1
parent57f4e17f99a8419b6fd90c8c3d5826fa0696640a
parentafc7b7bf4b90cb798c778490943d4a2f4f5853d2
Merge branch 'maint'