diff -r 5a6b6e770365 -r 68c69c656a2c web/lib/Zend/CodeGenerator/Php/Docblock.php
--- a/web/lib/Zend/CodeGenerator/Php/Docblock.php	Thu May 07 15:10:09 2015 +0200
+++ b/web/lib/Zend/CodeGenerator/Php/Docblock.php	Thu May 07 15:16:02 2015 +0200
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_CodeGenerator
  * @subpackage PHP
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Docblock.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
  */
 
 /**
@@ -33,7 +33,7 @@
 /**
  * @category   Zend
  * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
@@ -206,10 +206,11 @@
      */
     protected function _docCommentize($content)
     {
-        $indent = $this->getIndentation();
-        $output = $indent . '/**' . self::LINE_FEED;
+        $indent  = $this->getIndentation();
+        $output  = $indent . '/**' . self::LINE_FEED;
         $content = wordwrap($content, 80, self::LINE_FEED);
-        $lines = explode(self::LINE_FEED, $content);
+        $lines   = explode(self::LINE_FEED, $content);
+
         foreach ($lines as $line) {
             $output .= $indent . ' *';
             if ($line) {
@@ -217,8 +218,10 @@
             }
             $output .= self::LINE_FEED;
         }
+
+        $output = rtrim($output, ' *' . self::LINE_FEED) . self::LINE_FEED;
+
         $output .= $indent . ' */' . self::LINE_FEED;
         return $output;
     }
-
 }