Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 24 May 2014 10:49:58 +0000 (12:49 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 24 May 2014 10:49:58 +0000 (12:49 +0200)
commit05828dbf233f403695e40c6953e512f4b4ca3b55
treeb9ebefb23aabf730762d26e6ddcf1686ff58c10b
parent13acb7107bdcad679fb8e84929de492915071013
parent45c5c8e61e0601d3111196f216d7a46b37c73bb2
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WCF.Message.min.js
wcfsetup/install/files/js/WCF.js