Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 14 Apr 2014 13:47:15 +0000 (15:47 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 14 Apr 2014 13:47:15 +0000 (15:47 +0200)
commit0824027f486536ed7cdcdbcac48eca57c3694b83
treec2b7ebb2b75a64f388f9f68b79fad1f79b1cf0ed
parent870b0938ec20bb875c2aa2211f299a0c97f963b1
parentd7ddd4dc1b27c8367f5b2aa8fcf4338b3503ea32
Merge branch '2.0'

Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WCF.Message.min.js