From: Fredrik Tolf Date: Sun, 5 Aug 2012 16:18:22 +0000 (+0200) Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/wrw X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=7be9e8bb560cd4e969992759bbcb523b40e544af Merge branch 'master' of git.dolda2000.com:/srv/git/r/wrw --- 7be9e8bb560cd4e969992759bbcb523b40e544af