Merge branch 'master' into cache
Merge branch 'master' into cache

Conflicts:
index.php

file:a/index.php -> file:b/index.php
--- a/index.php
+++ b/index.php
@@ -34,8 +34,8 @@
      	($_GET['a'] != "blob_plain") &&
      	($_GET['a'] != "blobdiff_plain") &&
      	($_GET['a'] != "rss") &&
-     	($_GET['a'] != "opml")
-     	($_GET['a'] != "snapshot"))) {
+     	($_GET['a'] != "opml") &&
+	($_GET['a'] != "snapshot"))) {
 	$tpl->load_filter('output','trimwhitespace');
 	$extraoutput = TRUE;
 }

comments