Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Wed, 11 Jun 2014 22:38:22 +0000 (00:38 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 11 Jun 2014 22:38:22 +0000 (00:38 +0200)
commit45cc91d6d548f4827bcecfb351f956872530b9e2
tree4cd1c16ca6e9d69ef490af0e293af3a732eb8aff
parenta24a89e477c62f3eccfc9386006dd242d531dda2
parent909825747f0aeefc667ecb3dbb743328ef9d3013
Merge branch '2.0'

Conflicts:
com.woltlab.wcf/templates/user.tpl
com.woltlab.wcf/templates/user.tpl