prepared the 1.5.1 release

diff --git a/CHANGELOG b/CHANGELOG
index 3f089c1..74b6915 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-* 1.6.0-DEV
+* 1.5.1 (2012-01-05)
 
- * n/a
+ * fixed a regression when parsing strings
 
 * 1.5.0 (2012-01-04)
 

diff --git a/composer.json b/composer.json
index 0aa9abc..5e10735 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
     "description": "Twig, the flexible, fast, and secure template language for PHP",
     "keywords": ["templating"],
     "homepage": "http://twig.sensiolabs.org",
-    "version": "1.6.0",
+    "version": "1.5.1",
     "license": "BSD",
     "authors": [
         {

diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index 5467f03..71b6b0f 100644 (file)
--- a/ext/twig/php_twig.h
+++ b/ext/twig/php_twig.h
@@ -15,7 +15,7 @@
 #ifndef PHP_TWIG_H
 #define PHP_TWIG_H
 
-#define PHP_TWIG_VERSION "1.6.0-DEV"
+#define PHP_TWIG_VERSION "1.5.1"
 
 #include "php.h"
 

diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index 4ea903a..b11f727 100644 (file)
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -17,7 +17,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.6.0-DEV';
+    const VERSION = '1.5.1';
 
     protected $charset;
     protected $loader;