Merge branch 'master' into python3

author Fredrik Tolf <fredrik@dolda2000.com>

Sun, 1 Jan 2012 21:42:41 +0000 (22:42 +0100)

committer Fredrik Tolf <fredrik@dolda2000.com>

Sun, 1 Jan 2012 21:42:41 +0000 (22:42 +0100)
author Fredrik Tolf <fredrik@dolda2000.com>
Sun, 1 Jan 2012 21:42:41 +0000 (22:42 +0100)
committer Fredrik Tolf <fredrik@dolda2000.com>
Sun, 1 Jan 2012 21:42:41 +0000 (22:42 +0100)
diff --cc wrw/session.py
Simple merge
diff --cc wrw/util.py
Simple merge
author	Fredrik Tolf <fredrik@dolda2000.com>
	Sun, 1 Jan 2012 21:42:41 +0000 (22:42 +0100)
committer	Fredrik Tolf <fredrik@dolda2000.com>
	Sun, 1 Jan 2012 21:42:41 +0000 (22:42 +0100)
		1	2
wrw/session.py	patch \|	diff1 \|	diff2 \|	blob \| history
wrw/util.py	patch \|	diff1 \|	diff2 \|	blob \| history