From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 31 Aug 2012 05:56:35 +0000 (+0200)
Subject: Merge branch 'master' into jython
X-Git-Url: http://www.dolda2000.com/gitweb/?a=commitdiff_plain;h=b140c18886379be4611dda2973c10e1694c8d170;p=wrw.git

Merge branch 'master' into jython
---

b140c18886379be4611dda2973c10e1694c8d170