From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 7 Jun 2012 16:01:31 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git.sesse.net/www/wloh
X-Git-Url: https://git.sesse.net/?p=wloh;a=commitdiff_plain;h=4843c3cd5e24c0fc50394b04038517badf14f774

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

4843c3cd5e24c0fc50394b04038517badf14f774