Merge branch 'hotfix-7.8.06'
commit5d4e5cbe413cd049e3414ac22b6059213362de1c
authorBastien Guerry <bzg@altern.org>
Sun, 1 Apr 2012 20:12:16 +0000 (1 22:12 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 1 Apr 2012 20:12:16 +0000 (1 22:12 +0200)
tree222839138b65bdfac300a770eb813973af8774cc
parent7973f8e2fb7cf1a266e2aed33053e3e8677b3e70
parent68d8b10c9e18199809277be36d74dc8730fca4e7
Merge branch 'hotfix-7.8.06'