From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 13 Feb 2014 10:19:29 +0000 (+0100)
Subject: prepared the 1.15.1 release
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=1fb5784662f438d7d96a541e305e28b812e2eeed;p=web%2Fkonrad%2Ftwig.git

prepared the 1.15.1 release
---

diff --git a/CHANGELOG b/CHANGELOG
index 7a4c3a3..6be2d65 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-* 1.15.1 (2013-XX-XX)
+* 1.15.1 (2013-02-13)
 
  * fixed the conversion of the special '0000-00-00 00:00' date
  * added an error message when trying to import an undefined block from a trait
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index e3b9c50..858c0d8 100644
--- 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.15.1-DEV"
+#define PHP_TWIG_VERSION "1.15.1"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index f8b5882..1fec1a3 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -16,7 +16,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.15.1-DEV';
+    const VERSION = '1.15.1';
 
     protected $charset;
     protected $loader;