From ad7efe13a96dc5d9b5d48bfd5584d1094e3d3df3 Mon Sep 17 00:00:00 2001
From: Fred Wu <canglan@gmail.com>
Date: Wed, 30 Jun 2010 18:52:36 +1000
Subject: [PATCH] Oops, fixed the phpdoc.

---
 classes/kohana/date.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/kohana/date.php b/classes/kohana/date.php
index c3182c70f..2cd00a919 100644
--- a/classes/kohana/date.php
+++ b/classes/kohana/date.php
@@ -535,8 +535,9 @@ public static function dos2unix($timestamp = FALSE)
 	 *     $time = Date::formatted_time('5 minutes ago');
 	 *
 	 * @see     http://php.net/manual/en/datetime.construct.php
-	 * @param   integer  DOS timestamp
-	 * @return  integer
+	 * @param   string  datetime_str     datetime string
+	 * @param   string  timestamp_format timestamp format
+	 * @return  string
 	 */
 	public static function formatted_time($datetime_str = 'now', $timestamp_format = NULL)
 	{