Merge remote-tracking branch 'magu/bug-1131' into bug-1131
authorMichael Tänzer <neo@nhng.de>
Fri, 18 Oct 2013 13:23:33 +0000 (15:23 +0200)
committerMichael Tänzer <neo@nhng.de>
Fri, 18 Oct 2013 13:23:33 +0000 (15:23 +0200)
commit20928ae687de20d572cb2dba189b5efbeb058321
treedca7f3be9abd2457f1746e3b842d66fc5483d0a2
parentedda3adaa4582368b0330957de048a52b11944a3
parent04fadedabf3b8bf56a55c7ef5f2da9d67527a56e
Merge remote-tracking branch 'magu/bug-1131' into bug-1131

Conflicts:
www/policy/CertificationPracticeStatement.html

Signed-off-by: Michael Tänzer <neo@nhng.de>
www/policy/CertificationPracticeStatement.html