From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Mon, 17 Dec 2012 23:17:51 +0000 (+0100)
Subject: Merge branch 'master' of /srv/git.sesse.net/www/wloh
X-Git-Url: https://git.sesse.net/?p=wloh;a=commitdiff_plain;h=d717e4a68b4a74e949aa085fa65ea60eb44a4080

Merge branch 'master' of /srv/git.sesse.net/www/wloh
---

d717e4a68b4a74e949aa085fa65ea60eb44a4080