Merge branch 'maint'
commit51ad913982a4349840e2786472364370dae82e9f
authorBastien Guerry <bzg@altern.org>
Mon, 24 Dec 2012 00:15:06 +0000 (24 01:15 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 24 Dec 2012 00:15:06 +0000 (24 01:15 +0100)
tree6dbf27399060dd549b7efe2f3e5e15c71bf66013
parent4adf17f81193f6f0fdfac93875975d0a2f91752b
parentf4a2680f4c4007e99f799a280d46dfae52e90f7f
Merge branch 'maint'