Merge branch 'hotfix-7.8.06'
commitac24a454ac177b0b0d01927616abbec6c5171dcb
authorBastien Guerry <bzg@altern.org>
Sat, 24 Mar 2012 06:48:18 +0000 (24 07:48 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 24 Mar 2012 06:48:18 +0000 (24 07:48 +0100)
treeb8b2b353238b7c853dce48c9f8d3ca8ef692aebb
parent973695beb31b337f19b14932ddb68fe219a52c58
parentec65badbaa7114e56e6510f28b744d2b9ea8115f
Merge branch 'hotfix-7.8.06'