Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sun, 7 Sep 2014 13:21:46 +0000 (15:21 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 7 Sep 2014 13:21:46 +0000 (15:21 +0200)
commitf70647141ab187b66e60bd85f8c40e0993f21b1e
tree667ddc400a9c2f0ceab733aed980161f79660801
parentd949e64b2ebd5ed19a5921d05cec073eefb6890b
parent3d03808c3fb5319ac92c35bffbed16556db414a8
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php