Bump version to 2.5.4 and feature freeze 2.5 branch

Closes #124.

CHANGELOG.textile

@@ -2,13 +2,15 @@ h1. Changelog
 
 Here's a summary of changes in each release. The list doesn't include some small changes or updates to test cases.
 
-h2. Version 2.5.4 - upcoming
+_The 2.5 branch was feature frozen at this point._
+
+h2. "Version 2.5.4 - 2013/11/06":https://github.com/textile/php-textile/releases/tag/v2.5.4
 
 * Fix broken image alignment in HTML5 mode (closes "#123":https://github.com/textile/php-textile/issues/123.)
 * Fix duplicate HTML IDs that occur when a footnote isn't referenced in the content (closes "#125":https://github.com/textile/php-textile/issues/125.)
 * Don't include image alignment to the URL in restricted mode.
 * Detect and process quoted quote symbols.
-* New link parser (closes "#86":https://github.com/textile/php-textile/issues/86 and "#87":https://github.com/textile/php-textile/issues/87.)
+* New link parser (closes "#86":https://github.com/textile/php-textile/issues/86, "#87":https://github.com/textile/php-textile/issues/87 and "#128":https://github.com/textile/php-textile/issues/128.)
 
 h2. "Version 2.5.3 - 2013/10/30":https://github.com/textile/php-textile/releases/tag/v2.5.3
 

README.textile

@@ -7,11 +7,11 @@ h1. Textile for PHP
 h2. Branches
 
 |^=. "master":https://github.com/textile/php-textile/tree/master | Has a multi-file, namespaced, "PSR-0/1/2":https://github.com/php-fig/fig-standards/tree/master/accepted compliant version of Textile. Releases from master are tagged v3.5.x !https://travis-ci.org/textile/php-textile.png?branch=master!:https://travis-ci.org/textile/php-textile |^=. _Requires PHP5.3+_ |
-|^=. "2.5":https://github.com/textile/php-textile/tree/2.5       | Holds a single-file version of Textile representing the v2.5.x releases. It is *not* PSR-0 compliant but attempts to follow PSR-1 and PSR-2 in other respects.               !https://travis-ci.org/textile/php-textile.png?branch=2.5!:https://travis-ci.org/textile/php-textile    |^=. _Requires PHP5.0+_ |
+|^=. "2.5":https://github.com/textile/php-textile/tree/2.5       | Holds a feature-frozen single-file version of Textile representing the v2.5.x releases. It is *not* PSR-0 compliant but attempts to follow PSR-1 and PSR-2 in other respects.               !https://travis-ci.org/textile/php-textile.png?branch=2.5!:https://travis-ci.org/textile/php-textile    |^=. _Requires PHP5.0+_ |
 
 *This is the README for the 2.5 branch.*
 
-Currently both branches are feature synchronised at the point they are tagged, and new features and bugfixes go into both branches. *This _will_ change after the v2.5.4 release at which point the 2.5 branch will be feature frozen.*
+If you want the latest features use the master branch as this branch was feature frozen on 2013-11-06 and only receives security updates.
 
 From time to time other branches may be present in the repository. These represent transient development or hotfix branches and should not be used for live sites/projects.
 

classTextile.php

@@ -411,7 +411,7 @@ class Textile
      * @var string
      */
 
-    protected $ver = '2.5.3';
+    protected $ver = '2.5.4';
 
     /**
      * Regular expression snippets.