Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sat, 27 Sep 2014 20:16:59 +0000 (22:16 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 27 Sep 2014 20:16:59 +0000 (22:16 +0200)
commit8062d0ae5837e82567b2a06e95d274ced9b00bdc
treea62fec1f8223100d04a95200c3a20408970e4d57
parent008f00be52fcb5daa9635edc15f3b1f0c6aa2c60
parent06daa2430065e4daf460bc04ade2d7b006c850f0
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
wcfsetup/install/files/lib/form/MessageForm.class.php
wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php