Merge branch 'hotfix-7.8.06'
commitbd7913c2946eb074e0da0381d5843580b7bc09aa
authorBastien Guerry <bzg@altern.org>
Tue, 27 Mar 2012 21:08:52 +0000 (27 23:08 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 27 Mar 2012 21:08:52 +0000 (27 23:08 +0200)
tree7804a5508c9d2738b7361866950159073b1a1fd3
parenta4efcc3a3908801ab07a301bb9df6e555d8c6e2e
parent83af2107de141d99aa015ad20c676f67ef3cb8a0
Merge branch 'hotfix-7.8.06'