Forward port zendframework/zendframework#3522

Conflicts: library/Zend/Code/Generator/AbstractMemberGenerator.php library/Zend/Mvc/Controller/AbstractRestfulController.php library/Zend/Soap/Client/DotNet.php
zendframework · Jan 23, 2013 · 9fe9c96 · 9fe9c96
commit 9fe9c96
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/src/DateTime.php b/src/DateTime.php
@@ -40,5 +40,4 @@ public static function createFromISO8601($time, DateTimeZone $timezone = null)
 
         return self::createFromFormat($format, $time);
     }
-
 }
diff --git a/src/Message.php b/src/Message.php
@@ -115,5 +115,4 @@ public function toString()
         $request .= "\r\n" . $this->getContent();
         return $request;
     }
-
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,5 +40,4 @@ public static function createFromISO8601($time, DateTimeZone $timezone = null)

		return self::createFromFormat($format, $time);
		}

		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,5 +115,4 @@ public function toString() @@
             $request .= "\r\n" . $this->getContent();
             return $request;
         }
     }