Commit 172ad891 by Carl Whittaker

Merge branch 'development' of github.com:defunkt/pystache into development

Conflicts:
	tests/test_simple.py
parents 088b5713 c6e3e50b
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment