Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 9 Jan 2013 13:11:12 +0000 (14:11 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 9 Jan 2013 13:11:12 +0000 (14:11 +0100)
commit1dd1b10d5a908ef302b76838931aefdab2d05f34
tree3aa6c7319aebb06d587068a071d9b7bd7426a2b1
parent81959fc8c0607490eecab8ac540f36070e6722ad
parent79dd795fe4abb5fdcc1340194b25b958342b8c66
Merge branch 'maint'