Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sun, 5 Oct 2014 14:00:13 +0000 (16:00 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 5 Oct 2014 14:00:13 +0000 (16:00 +0200)
commit857e856d79d74efef8200bd2b3269a53645e5910
treed266c1cc1b811b9587572fdd1a519f4a33e5b026
parentbe515b48a9ab63ba5eef82b8e01dc21c5f24271c
parent0c2637783cde44f7bc4eccffaa3b06372bcaa435
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/js/WCF.ACL.min.js
wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php