Merge branch 'hotfix-7.8.06'
commit138fd8e474123a9b01a80e49875fa1d073a2b13b
authorBastien Guerry <bzg@altern.org>
Wed, 21 Mar 2012 22:57:36 +0000 (21 23:57 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 21 Mar 2012 22:57:36 +0000 (21 23:57 +0100)
tree9256d30aa34a72e4da613df4771216f07aad16c9
parentab771171cfd5a8fc3523227356c27eb4021c0c30
parent652e5e0ecfe54b75097a7048ff31a7f0e971a2a4
Merge branch 'hotfix-7.8.06'