Merge branch 'maint'
commit2c164be668dfa5f515bbfafc5249f8f9242fc588
authorBastien Guerry <bzg@altern.org>
Thu, 13 Dec 2012 22:47:17 +0000 (13 23:47 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 13 Dec 2012 22:47:17 +0000 (13 23:47 +0100)
tree14c77d298ffcc6d62f4c03ccd4309ce2328db97d
parent26d24900e1ebf5fa92233921198820c8ee740ae2
parent4524a02b39e55b1ab3989c0c5281121ad84f4fb0
Merge branch 'maint'