diff options
author | Michael Tänzer <neo@nhng.de> | 2011-07-29 00:02:33 +0200 |
---|---|---|
committer | Michael Tänzer <neo@nhng.de> | 2011-07-29 00:02:33 +0200 |
commit | d378e1f64b257c431f4f76986a123715e46ea888 (patch) | |
tree | e45b647acc854a4ceb7746a3a33632ebf49d4ef7 | |
parent | b5f3bc91b5aa68c9805acb2786c11af4aaa2bd9f (diff) | |
parent | 983a7dced2bc15cfb5760b81659bc72fb39b2567 (diff) | |
download | cacert-devel-d378e1f64b257c431f4f76986a123715e46ea888.tar.gz cacert-devel-d378e1f64b257c431f4f76986a123715e46ea888.tar.xz cacert-devel-d378e1f64b257c431f4f76986a123715e46ea888.zip |
Merge branch 'tarballs' into release
Conflicts:
scripts/mass-revoke.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
-rw-r--r-- | www/policy/CertificationPracticeStatement.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/www/policy/CertificationPracticeStatement.php b/www/policy/CertificationPracticeStatement.php index e35afc9..e17056b 100644 --- a/www/policy/CertificationPracticeStatement.php +++ b/www/policy/CertificationPracticeStatement.php @@ -69,7 +69,7 @@ a:hover { <a href="PolicyOnPolicy.html"><img src="cacert-draft.png" alt="CAcert Policy Status" height="31" width="88" style="border-style: none;" /></a><br /> Creation date: 20060726<br /> Status: DRAFT p20091108<br /> -<!-- $Id: CertificationPracticeStatement.php,v 1.1 2009-11-21 22:34:00 philipp Exp $ --> +<!-- $Id: CertificationPracticeStatement.php,v 1.2 2011-07-27 10:41:01 wytze Exp $ --> <font size="-1"> |