diff --git a/PHP Markdown Extra Readme.text b/PHP Markdown Extra Readme.text
index 8c105b9..25b981b 100644
--- a/PHP Markdown Extra Readme.text	
+++ b/PHP Markdown Extra Readme.text	
@@ -1,7 +1,11 @@
 PHP Markdown Extra
 ==================
 
+<<<<<<< HEAD:PHP Markdown Extra Readme.text
 Version 1.2.6 - Sun 13 Jan 2013
+=======
+Version 1.0.1p - 11 Apr 2013
+>>>>>>> master:PHP Markdown Readme.text
 
 by Michel Fortin  
 <http://michelf.ca/>
@@ -214,6 +218,12 @@ Current Extra:
 *	Fixed a PHP notice message triggered when some table column separator 
 	markers are missing on the separator line below column headers.
 
+1.0.1q (11 Apr 2013):
+
+*	Fixed a small mistake that could cause the parser to retain an invalid
+	state related to parsing links across multiple runs. This was never 
+	observed (that I know of), but it's still worth fixing.
+
 
 Extra 1.2.6 (13 Jan 2013):
 
diff --git a/markdown.php b/markdown.php
index 278b291..f972fd9 100644
--- a/markdown.php
+++ b/markdown.php
@@ -12,8 +12,8 @@
 #
 
 
-define( 'MARKDOWN_VERSION',  "1.0.1p" ); # Sun 13 Jan 2013
-define( 'MARKDOWNEXTRA_VERSION',  "1.2.6" ); # Sun 13 Jan 2013
+define( 'MARKDOWN_VERSION',  "1.0.11" ); # 11 Apr 2013
+define( 'MARKDOWNEXTRA_VERSION',  "1.2.6" ); # 11 Apr 2013
 
 
 #
@@ -79,7 +79,11 @@ Plugin Name: Markdown Extra
 Plugin Name: Markdown
 Plugin URI: http://michelf.ca/projects/php-markdown/
 Description: <a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a> allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by <a href="http://daringfireball.net/">John Gruber</a>. <a href="http://michelf.ca/projects/php-markdown/">More...</a>
+<<<<<<< HEAD
 Version: 1.2.6
+=======
+Version: 1.0.1q
+>>>>>>> master
 Author: Michel Fortin
 Author URI: http://michelf.ca/
 */