Merge branch 'master' of github.com:WoltLab/WCF
authorMagnus Kühn <magnus.khn@gmail.com>
Wed, 26 Jun 2013 16:30:30 +0000 (18:30 +0200)
committerMagnus Kühn <magnus.khn@gmail.com>
Wed, 26 Jun 2013 16:30:30 +0000 (18:30 +0200)

Trivial merge