From fd0c0a608a5de2b26c29d3c44a7929e5a3b2c042 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 May 2009 00:14:07 +0000
Subject: Updated kohana and modules/unit_test to upstream r4356

---
 kohana/core/Benchmark.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kohana/core/Benchmark.php')

diff --git a/kohana/core/Benchmark.php b/kohana/core/Benchmark.php
index 09909126..3bb6d04f 100644
--- a/kohana/core/Benchmark.php
+++ b/kohana/core/Benchmark.php
@@ -109,7 +109,7 @@ final class Benchmark {
 	 *
 	 * @return  integer
 	 */
-	private function memory_usage()
+	private static function memory_usage()
 	{
 		static $func;
 
-- 
cgit v1.2.3