From bb9fc11a08ff38af5502a46310ed1b1eeae6d899 Mon Sep 17 00:00:00 2001
From: root <root@ubuntu-server.epic>
Date: Wed, 21 Sep 2011 23:05:01 -0400
Subject: [PATCH] Flipping merge items to be a static method.

---
 SimplePie/Core.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SimplePie/Core.php b/SimplePie/Core.php
index 82a30f2ba..28eb477c3 100644
--- a/SimplePie/Core.php
+++ b/SimplePie/Core.php
@@ -2788,7 +2788,7 @@ public function sort_items($a, $b)
 	/**
 	 * @static
 	 */
-	public function merge_items($urls, $start = 0, $end = 0, $limit = 0)
+	public static function merge_items($urls, $start = 0, $end = 0, $limit = 0)
 	{
 		if (is_array($urls) && sizeof($urls) > 0)
 		{