Merge branch 'hotfix-7.8.06'
commit2120c372e564f769bd782904d451e1f7077f6421
authorBastien Guerry <bzg@altern.org>
Mon, 26 Mar 2012 20:39:52 +0000 (26 22:39 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 26 Mar 2012 20:39:52 +0000 (26 22:39 +0200)
tree7b5a5001c45a49679ecc34a2eeb9670f3d102c5b
parentd1ed59032035a413b1afd87a06069c9296a5d6f6
parent3c57eb297bdc0d6954998f8120c14b666577fde1
Merge branch 'hotfix-7.8.06'