From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 16 Nov 2012 00:46:04 +0000 (+0100)
Subject: Merge branch 'master' into jython
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=c7cc3ff342419755855aa93f165920d4f0107aac;p=wrw.git

Merge branch 'master' into jython
---

c7cc3ff342419755855aa93f165920d4f0107aac