Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 6 Nov 2013 15:26:49 +0000 (16:26 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 6 Nov 2013 15:26:49 +0000 (16:26 +0100)
commit41755e24ed63077581934a24d62d4017015e57c0
tree4223c750a09317bdf930c52b536aeff2834864b3
parent39d22406e486582796807a7398614ab2e80a8d74
parent47b0eec8dc39990731f400640d64ab70a8356ccd
Merge branch 'maint'