Merge branch 'maint'
commit7f74da3f2290af21b44e5139e19362f1e5068cb5
authorBastien Guerry <bzg@altern.org>
Mon, 1 Oct 2012 05:53:01 +0000 (1 07:53 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 1 Oct 2012 05:53:01 +0000 (1 07:53 +0200)
treef01e687e7b67c7bc84f022bcb4400a4cbaf4dda0
parent934208ece1b74b7bc0e70bc07a3637a2e467a1fb
parent1df9907b50a20fd9218532df053b77937bf2c4c9
Merge branch 'maint'