Merge pull request #2503 from dereuromark/master-string

Correct doc block

lib/Cake/Utility/String.php

@@ -105,7 +105,7 @@ class String {
  * @param string $separator The token to split the data on.
  * @param string $leftBound The left boundary to ignore separators in.
  * @param string $rightBound The right boundary to ignore separators in.
- * @return array Array of tokens in $data.
+ * @return mixed Array of tokens in $data or original input if empty.
  */
 	public static function tokenize($data, $separator = ',', $leftBound = '(', $rightBound = ')') {
 		if (empty($data) || is_array($data)) {