From 88236d82b81c9e742a24638922769e7f07c3bff8 Mon Sep 17 00:00:00 2001
From: Martin Gummi <martin.gummi@gmx.net>
Date: Wed, 19 Jun 2013 00:42:02 +0200
Subject: bug-1102: Redirect to CertificationPracticeStatement.php

---
 pages/index/10.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pages/index/10.php b/pages/index/10.php
index 9e09bb8..838d0b2 100644
--- a/pages/index/10.php
+++ b/pages/index/10.php
@@ -15,10 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<p style="background-color: #FF8080; font-size: 150%">
-<?
-printf(_('This page has been moved to the %spolicy directory%s. Please update '.
-		'your bookmarks and report any broken links.'),
-	'<a href="/policy/PrivacyPolicy.html">', '</a>');
-?>
-</p>
+<?php
+    header('HTTP/1.0 301 Moved Permanently');
+    header('Location: http://www.cacert.org/policy/CertificationPracticeStatement.php');
+    exit();
-- 
cgit v1.2.1


From 112033ca364acca4e6ead25abd3711c719bdb0dc Mon Sep 17 00:00:00 2001
From: Benny Baumann <BenBE@geshi.org>
Date: Wed, 19 Jun 2013 22:07:51 +0200
Subject: bug 1102: avoid splitting the PHP code block when not sensible

---
 pages/index/10.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/index/10.php b/pages/index/10.php
index 838d0b2..7280e09 100644
--- a/pages/index/10.php
+++ b/pages/index/10.php
@@ -14,8 +14,8 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/ ?>
-<?php
+*/
+
     header('HTTP/1.0 301 Moved Permanently');
     header('Location: http://www.cacert.org/policy/CertificationPracticeStatement.php');
     exit();
-- 
cgit v1.2.1