Merge branch 'master' into css-feedtree-counter

Conflicts:
	tt-rss.css

1 files changed, 0 insertions, 29 deletions

diff --git a/plugins/example_feed/init.php b/plugins/example_feed/init.php
deleted file mode 100644
index af14d3ff3..000000000
--- a/plugins/example_feed/init.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-class Example_Feed extends Plugin {
-
-	// Demonstrates how to query data from the parsed feed object (SimplePie)
-	// don't enable unless debugging feed through f D hotkey or manually.
-
-	private $link;
-	private $host;
-
-	function about() {
-		return array(1.0,
-			"Example feed plugin",
-			"fox",
-			true);
-	}
-
-	function init($host) {
-		$this->link = $host->get_link();
-		$this->host = $host;
-
-		$host->add_hook($host::HOOK_FEED_PARSED, $this);
-	}
-
-	function hook_feed_parsed($feed) {
-		_debug("I'm a little feed short and stout, here's my title: " . $feed->get_title());
-		_debug("... here's my link element: " . $feed->get_link());
-	}
-}
-?>