Merge branch 'master' into html5Validation
authorTim Düsterhus <timwolla@arcor.de>
Wed, 11 Jan 2012 18:19:14 +0000 (19:19 +0100)
committerTim Düsterhus <timwolla@arcor.de>
Wed, 11 Jan 2012 18:19:14 +0000 (19:19 +0100)
commitd811cf096c1423160f9b05660ebab6279f27ce97
treea536d9fdb7a770d92a4277626e5cd0ef1d0d4481
parent5757a82067479c09676dd79515b07f8e785e7de4
parent5f57ce8d688e580799ca3c5915c2219defea25a4
Merge branch 'master' into html5Validation

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