Merge branch 'master' into test
commit1b817c9c04ab36994009309dfe436e9faa774db5
authorBruno Vetel <bvetel@gmail.com>
Thu, 1 Jan 2009 11:35:40 +0000 (1 12:35 +0100)
committerBruno Vetel <bvetel@gmail.com>
Thu, 1 Jan 2009 11:35:40 +0000 (1 12:35 +0100)
tree9f49115cf0119fea8834d04700b34d9c32c9d519
parent06ec2a3c509dda4a204ab15727453f0dd9e22c58
parentdd2d74b876a8ef0f6db75fd448a5a11c9eff96d6
Merge branch 'master' into test