Merge branch 'hotfix-7.8.06'
commit56321d9a877347932c7029feb9b0e9c25a7e1d97
authorBastien Guerry <bzg@altern.org>
Wed, 28 Mar 2012 00:08:08 +0000 (28 02:08 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 28 Mar 2012 00:08:08 +0000 (28 02:08 +0200)
treec95c2ec9eecb7dd165fcf012ea385751a390cc3a
parent57f8bbf7eab8dbdb906fdb9364705ed5ec50dd94
parent6ca74804c988085feb2160c137c0f9a3b579ded2
Merge branch 'hotfix-7.8.06'