Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 6 Nov 2013 14:52:15 +0000 (15:52 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 6 Nov 2013 14:52:15 +0000 (15:52 +0100)
commit17eda87a393d69a47e98d18596e69c75992149d0
treed519acfdb7152bd808bdb3701005edfc5569ec44
parent990339ea23a9b220d8eb97f246d94b35fc38c431
parent747f46aa1f94fc8375fddd3620e15b9b0c0ff86e
Merge branch 'maint'