Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 24 Oct 2012 13:56:11 +0000 (15:56 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Oct 2012 13:56:11 +0000 (15:56 +0200)
commit53f7880d6f4cb3bce518483d78a54b466fcc1945
treeec6cae7ee54b1dc463d68b64096c5a46da8b021a
parent66cc45e6700d2de894bd23c9c979a7acb79648b3
parentc3390982cb4959f24b7747a70295443e1e36bff8
Merge branch 'maint'