Source code taken from cacert-20141124.tar.bz2
Merge branch 'tarballs' into release

Conflicts:
	scripts/send_policy_cca_20140916.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
Merge remote-tracking branch 'origin/bug-1288' into release
Merge remote-tracking branch 'origin/bug-1318' into release
Merge remote-tracking branch 'origin/bug-790' into release
Merge branch 'release' into bug-1131

Conflicts:
	pages/wot/6.php
	www/policy/CAcertCommunityAgreement.php

The conflict in the CCA document page was introduced due to the rename of the file.
This instance can be safely ignored, as bug 1131 introduces a new version
superseeding the old document.

The instance in pages/wot/6.php is a bit more complicated, but basically
results from a change of bug 1137 and the modified paths to the policy documents.
Merge branch 'bug-1131' into testserver-stable