Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Mon, 18 Aug 2014 22:34:59 +0000 (00:34 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 18 Aug 2014 22:34:59 +0000 (00:34 +0200)
commit6afbd3e7dea7e6ee2af071d08fe5515d63814845
tree4e204a174d5f10e8fd8d5cfe0928411c7203dd76
parent08b99420abe3d7da1cc6dacacc68ff05c73c4c42
parent25729b8724284bcd25794aab6d02a6cf3cc9a865
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/js/WCF.Message.min.js
wcfsetup/install/files/lib/util/StringUtil.class.php