Merge remote-tracking branch 'remotes/origin/proxyCertificate'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 20 Dec 2014 00:06:48 +0000 (01:06 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 20 Dec 2014 00:06:48 +0000 (01:06 +0100)

Trivial merge