Merge branch 'hotfix-7.8.06'
commitab771171cfd5a8fc3523227356c27eb4021c0c30
authorBastien Guerry <bzg@altern.org>
Wed, 21 Mar 2012 22:50:57 +0000 (21 23:50 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 21 Mar 2012 22:50:57 +0000 (21 23:50 +0100)
tree9292265dee8b4bf2c6a8662f8a5fc24b4c7bb14f
parenteb5a450686355560ce7b95b780f64df061715ea9
parent5f7d9bffd7fb3afc5f11767f4b1c832005f2cedc
Merge branch 'hotfix-7.8.06'