Merge branch 'maint'
commit45ed388387af9524d64d44f962b1e1f9b34cd47e
authorBastien Guerry <bzg@altern.org>
Mon, 7 Jan 2013 23:00:03 +0000 (8 00:00 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 7 Jan 2013 23:00:03 +0000 (8 00:00 +0100)
tree64dc4ddf578f82acc928814bfe9b148b35515927
parent7feec64988feadc1804eeb890c00e7ec30ea21bd
parent195173eef0aa687510440d8965832aa093649553
Merge branch 'maint'