Merge branch 'master' into markup

Conflicts: library/Zend/Markup/Parser/Textile.php library/Zend/Markup/Renderer/AbstractRenderer.php library/Zend/Markup/Renderer/Html.php
zendframework · Oct 30, 2010 · d15662e · d15662e
2 parents aba74e9 + 98ba294
commit d15662e
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 12 deletions.
diff --git a/languages/de/Zend_Validate.php b/languages/de/Zend_Validate.php
@@ -17,7 +17,6 @@
  * @subpackage Ressource
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/languages/en/Zend_Validate.php b/languages/en/Zend_Validate.php
@@ -17,7 +17,6 @@
  * @subpackage Ressource
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/languages/es/Zend_Validate.php b/languages/es/Zend_Validate.php
@@ -17,7 +17,6 @@
  * @subpackage Ressource
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/languages/fr/Zend_Validate.php b/languages/fr/Zend_Validate.php
@@ -17,7 +17,6 @@
  * @subpackage Ressource
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/languages/it/Zend_Validate.php b/languages/it/Zend_Validate.php
@@ -17,7 +17,6 @@
  * @subpackage Ressource
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/languages/ja/Zend_Validate.php b/languages/ja/Zend_Validate.php
@@ -17,7 +17,6 @@
  * @subpackage Ressource
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/languages/nl/Zend_Validate.php b/languages/nl/Zend_Validate.php
@@ -17,7 +17,6 @@
  * @subpackage Ressource
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/languages/pt_BR/Zend_Validate.php b/languages/pt_BR/Zend_Validate.php
@@ -17,7 +17,6 @@
  * @subpackage Ressource
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/languages/ru/Zend_Validate.php b/languages/ru/Zend_Validate.php
@@ -17,7 +17,6 @@
  * @subpackage Ressource
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/languages/sr/Zend_Validate.php b/languages/sr/Zend_Validate.php
@@ -17,7 +17,6 @@
  * @subpackage Ressource
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/languages/sv/Zend_Validate.php b/languages/sv/Zend_Validate.php
@@ -17,7 +17,6 @@
  * @subpackage Ressource
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/languages/uk/Zend_Validate.php b/languages/uk/Zend_Validate.php
@@ -17,7 +17,6 @@
  * @subpackage Ressource
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**