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 · 6e16921 · 6e16921
commit 6e16921
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/Encrypt/BlockCipher.php b/src/Encrypt/BlockCipher.php
@@ -261,5 +261,4 @@ public function toString()
     {
         return 'BlockCipher';
     }
-
 }