Merge branch 'hotfix-7.8.06'
commitba813ffd201538d2fa289e47c97bcc3fdafd144a
authorBastien Guerry <bzg@altern.org>
Sun, 25 Mar 2012 00:49:28 +0000 (25 01:49 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 25 Mar 2012 00:49:28 +0000 (25 01:49 +0100)
tree45dc14a428038a41a116be458989de62e47e4b38
parentac24a454ac177b0b0d01927616abbec6c5171dcb
parente8337f69202bab64702bfe067711f64607794b4c
Merge branch 'hotfix-7.8.06'