Merge branch 'release' into testserver-mods
authorMichael Tänzer <neo@nhng.de>
Thu, 21 Jul 2011 01:33:12 +0000 (03:33 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 21 Jul 2011 01:33:12 +0000 (03:33 +0200)
commitac17d1910d1a27e802175915820bf817bd6da067
treef4d271f65b2eb7224e8c5d4ff71985dab18e8ee7
parent887f3ab9235ad36df6fb8cd206b07233019d7de8
parentad05aab44ae1995a9db6323785fe29402a1a5e69
Merge branch 'release' into testserver-mods

Conflicts:
www/certs/class3.crt
www/certs/class3.der
www/certs/class3.txt

Signed-off-by: Michael Tänzer <neo@nhng.de>