Merge branch 'hotfix-7.8.06'
commit3306fc1040d49ae93daa3484436b5f40c0fb97dc
authorBastien Guerry <bzg@altern.org>
Sun, 1 Apr 2012 20:25:03 +0000 (1 22:25 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 1 Apr 2012 20:25:03 +0000 (1 22:25 +0200)
tree1d418bb1a5d0a48354d30e7d47c932cd152b0d7d
parent5d4e5cbe413cd049e3414ac22b6059213362de1c
parent1e62a6e44629ce18d06a5c0f8a1026393bffb43d
Merge branch 'hotfix-7.8.06'