Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sat, 17 May 2014 15:13:08 +0000 (17:13 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 17 May 2014 15:13:08 +0000 (17:13 +0200)
commit4a0567204f62a497dbab41869165aac5e0cb3df1
tree320be552e7e5c9d91db222c411f7efa867406544
parent931e10ac6322d884e71ac5b897219cfec5818f44
parent0ad655d21ba53ec9db901c8cac3439c1bb56bf11
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/js/WCF.Tagging.min.js
wcfsetup/install/files/lib/util/DateUtil.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml