Merge branch 'hotfix-7.8.06'
commitc4978d6210fa13733b2840be3ad5fdb18d351852
authorBastien Guerry <bzg@altern.org>
Wed, 21 Mar 2012 00:14:31 +0000 (21 01:14 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 21 Mar 2012 00:14:31 +0000 (21 01:14 +0100)
treee92d3aa65ec0c8d58a354658ede85bd1453147c9
parente2f490826c6284c30115b7d3a836118362839eed
parent431407cc27bafa6e22a2b72fe6c34b2a2aebcac1
Merge branch 'hotfix-7.8.06'