Merge branch 'master' of github.com:WoltLab/WCF
authorMagnus Kühn <magnus.khn@gmail.com>
Sun, 30 Jun 2013 07:20:01 +0000 (09:20 +0200)
committerMagnus Kühn <magnus.khn@gmail.com>
Sun, 30 Jun 2013 07:20:01 +0000 (09:20 +0200)

Trivial merge