Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.acp.language
authorMarcel Werk <burntime@woltlab.com>
Sun, 30 Dec 2012 18:42:13 +0000 (19:42 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 30 Dec 2012 18:42:13 +0000 (19:42 +0100)

Trivial merge