Merge remote-tracking branch 'origin/bug-1114' into release
Merge remote-tracking branch 'origin/bug-1111' into release
Merge remote-tracking branch 'origin/bug-977' into release
Merge branch 'release' into testserver-mods

Conflicts:
	www/cats/cats_import.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
Merge branch 'bug-1070' into release
Source code taken from cacert-20121211.tar.bz2
Merge branch 'tarballs' into release
Merge branch 'release' into testserver
testserver: Work around CRLs redirecting to crl.cacert.org

Signed-off-by: Michael Tänzer <neo@nhng.de>
Cherry-pick fix that got lost on merge conflict resolution

bug 1072: Change IP addresses

Signed-off-by: Michael Tänzer <neo@nhng.de>
(cherry picked from commit 042c5b32c12de2122170c0849b4fd6417427b923)

Conflicts:

	www/cats/cats_import.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
Merge branch 'testserver-mods' into testserver