From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Mon, 27 Aug 2012 04:17:30 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=3e91bb195838a6c561358a44f654f41f46e9c95f;hp=3e91bb195838a6c561358a44f654f41f46e9c95f;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/sp/xhtml.py
---