Merge branch 'hotfix-7.8.06'
commit6e276f3b4560dba4fde7aa92ff965cc9fad74662
authorBastien Guerry <bzg@altern.org>
Fri, 23 Mar 2012 21:14:22 +0000 (23 22:14 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 23 Mar 2012 21:14:22 +0000 (23 22:14 +0100)
treecfb647e4d29e7f137d5092bcc46d8a29701ca7e3
parent1a81418320dcd4b949d094cde42eca5e53a67a5c
parent86643eba4f6d9bc83dea5d7dfb904f7fa9d6b3d3
Merge branch 'hotfix-7.8.06'