Merge branch 'release' into bug-1131 bug-1131
authorBenny Baumann <BenBE@geshi.org>
Tue, 16 Dec 2014 20:03:54 +0000 (21:03 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 16 Dec 2014 20:08:25 +0000 (21:08 +0100)
commit0988a0c268653910f78a50e16d34edf14a89dc13
tree3c8bcc1e070b4c15825758e16b4a426a58cf1fe0
parentdd6c8d16286f10c22b0fe7e4908825e18db9d703
parent5596d4a37845019c6053c184a94689101a7d48a8
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.
pages/index/0.php
pages/index/1.php
pages/wot/6.php
www/policy/CAcertCommunityAgreement.php