Merge branch 'maint'
commit92d08a3efdaf309acae4faf9ae95f0079ea8fff1
authorBastien Guerry <bzg@altern.org>
Tue, 26 Feb 2013 13:37:15 +0000 (26 14:37 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 26 Feb 2013 13:37:15 +0000 (26 14:37 +0100)
treeeef94556a4abfe845a9f1083388045b64d5fb147
parentde73b359090468d1846284d1192e89869def1ea3
parent889d671277b3cf0c942078db7aa622e5fdfff1e2
Merge branch 'maint'