Merge branch 'hotfix-7.8.06'
commitef0ab2fc4c33988c918b9dea4397c6aecc7a97ce
authorBastien Guerry <bzg@altern.org>
Mon, 26 Mar 2012 21:02:35 +0000 (26 23:02 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 26 Mar 2012 21:02:35 +0000 (26 23:02 +0200)
tree66e234c5b655688daa08d983056c4567a3cd8153
parent2ae78a5dab40cc058d127f67c72c56c591784cb8
parentf2598e41acbcb038313db5da68de890846ff21a6
Merge branch 'hotfix-7.8.06'