Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 22 Jan 2013 13:08:44 +0000 (14:08 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 22 Jan 2013 13:08:44 +0000 (14:08 +0100)
commit74c7e02bcf3844624ebe91dc061b9dbedd8eb72f
tree5f833f631597d0e664b7498887f33cd8c2070eae
parent627b3faa3d720ff02fa777c5fe74088fbf45dba3
parent7006f36d3daca1fc8cc78986c93c327941537b74
Merge branch 'maint'