Merge branch 'maint'
commit5c171435ba38955a160d191640cd577425055b55
authorBastien Guerry <bzg@altern.org>
Thu, 25 Oct 2012 08:49:35 +0000 (25 10:49 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 25 Oct 2012 08:49:35 +0000 (25 10:49 +0200)
tree0481ae75987b8c9bad153f6da5498f48e8ecd426
parent53f7880d6f4cb3bce518483d78a54b466fcc1945
parentaba9e2b94dadcd655e462252a5c79edf61bfa65c
Merge branch 'maint'