change 2.7
Add CJK character URL support
fix <form>
No change
Merge pull request #22 from yin8086/oldmaster

Add CJK character URL support
delete urllib module
Merge pull request #23 from yin8086/oldmaster

delete urllib module
Added Disqus comments to pages. Simply add a DISQUS_SHORTNAME setting to your settings.py and comments should appear.
Merge remote-tracking branch 'origin/master'
Has to be .String(), .LargeBinary() can't be filtered on it seems
Updated simple to use Pygments (if available) to highlight code. Also updated the readme with new screenshots and a proper feature list.
Small fix with the extensions logic.
When publishing a post update the created_at time so it appears first on the list of new posts.
Preview functionality re-written. Previews now appear in a proper browser window just as they would if they were published. Edits made to the content are reflected in the preview window automatically (after they are saved, which occurs every 3 seconds) and your scroll position is saved.
Merge branch 'master' of git://github.com/orf/simple

Conflicts:
	simple.py
	templates/edit.html
	templates/layout.html
	templates/post_preview.html