Merge remote-tracking branch 'remotes/CAcertTestserver/release' into bug-782
authorINOPIAE <inopiae@cacert.org>
Fri, 18 Jan 2013 01:30:48 +0000 (02:30 +0100)
committerINOPIAE <inopiae@cacert.org>
Fri, 18 Jan 2013 01:30:48 +0000 (02:30 +0100)

Trivial merge