Merge branch 'master' into development

3 files changed, 9 insertions, 7 deletions

diff --git a/HISTORY.md b/HISTORY.md
index 01c9049..9828dac 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,8 @@
 History
 =======
 
+**Note:** Official support for Python 2.4 will end with Pystache version 0.6.0.
+
 0.5.3 (TBD)
 -----------
 
@@ -16,6 +18,7 @@ History
 -   Added a `parse()` function that yields a printable, pre-compiled
     parse tree.
 -   Added support for rendering pre-compiled templates.
+-   Added Python 3.3 to the list of supported versions.
 -   Added support for [PyPy](http://pypy.org/) (issue \#125).
 -   Added support for [Travis CI](http://travis-ci.org) (issue \#124).
     [msabramo]
@@ -25,6 +28,8 @@ History
     when getting a key from a context stack (issue \#110).
 -   Bugfix: lambda section values can now return non-ascii, non-unicode
     strings (issue \#118).
+-   Bugfix: running `test_pystache.py` from a downloaded sdist no longer
+    requires a spec test directory to pass.
 -   Convert HISTORY and README files from reST to Markdown.
 -   More robust handling of byte strings in Python 3.
 -   Added Creative Commons license for David Phillips's logo.
diff --git a/README.md b/README.md
index 299344d..7120cce 100644
--- a/README.md
+++ b/README.md
@@ -10,11 +10,11 @@ Pystache
 <!-- -->
 <!-- We leave the leading brackets empty here.  Otherwise, unwanted -->
 <!-- caption text shows up in the reST version converted by pandoc. -->
-![](https://raw.github.com/defunkt/pystache/master/gh/images/logo_phillips.png "mustachioed, monocled snake by David Phillips")
+![](http://defunkt.github.com/pystache/images/logo_phillips.png "mustachioed, monocled snake by David Phillips")
 
 ![](https://secure.travis-ci.org/defunkt/pystache.png)
 
-[Pystache](https://github.com/defunkt/pystache) is a Python
+[Pystache](http://defunkt.github.com/pystache) is a Python
 implementation of [Mustache](http://mustache.github.com/). Mustache is a
 framework-agnostic, logic-free templating system inspired by
 [ctemplate](http://code.google.com/p/google-ctemplate/) and
@@ -67,6 +67,8 @@ as follows:
 
     pip install 'simplejson<2.1.0'
 
+Official support for Python 2.4 will end with Pystache version 0.6.0.
+
 Install It
 ----------
 
diff --git a/TODO.md b/TODO.md
index 00c675a..b8a568a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,11 +1,6 @@
 TODO
 ====
 
-In master branch, after merging to master:
-
-* Enable web page after merging.
-* Change README to link to the repo version of the logo.
-
 In development branch:
 
 * End support for Python 2.4.