Merge branch 'master' into html5Validation
authorTim Düsterhus <timwolla@arcor.de>
Thu, 5 Jan 2012 19:02:11 +0000 (20:02 +0100)
committerTim Düsterhus <timwolla@arcor.de>
Thu, 5 Jan 2012 19:02:11 +0000 (20:02 +0100)
commit5757a82067479c09676dd79515b07f8e785e7de4
treecfc338c26259ba8ea28433925220dcf9ecb9e514
parent9ead265e17c6481c9832861bc2ef67e1c4f4c425
parent9e8c9737d59894af6329432c8e5629bec3ecee36
Merge branch 'master' into html5Validation

Conflicts:
wcfsetup/install/files/acp/style/wcf.css
wcfsetup/install/files/acp/style/wcf.css