Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sat, 26 Apr 2014 13:11:56 +0000 (15:11 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 26 Apr 2014 13:11:56 +0000 (15:11 +0200)
commit80fc92361126013dfea07d7b8895aa08e2ccc4a6
tree09a33150efdd52eedde50a71c95df5f9e8d7b433
parent4c92bec9ddc088d613c8c213e813b08d635ace94
parent838fdcc6f251d62dde1b27f1cccba09e268d8d19
Merge branch '2.0'

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