Merge branch 'master' of github.com:WoltLab/WCF
authorMagnus Kühn <magnus.khn@gmail.com>
Sat, 29 Jun 2013 17:36:08 +0000 (19:36 +0200)
committerMagnus Kühn <magnus.khn@gmail.com>
Sat, 29 Jun 2013 17:36:08 +0000 (19:36 +0200)

Trivial merge