From: Fredrik Tolf Date: Sun, 6 Nov 2011 19:56:52 +0000 (+0100) 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=a4811d704ac8b4d97ae9af3841823ad2b56c4380 Merge branch 'master' of git.dolda2000.com:/srv/git/r/wrw --- a4811d704ac8b4d97ae9af3841823ad2b56c4380