From: Bjørn Rustad <bjorn@rustad.me>
Date: Sat, 17 Aug 2013 13:23:10 +0000 (+0200)
Subject: Merge branch 'master' of /var/git/duplo
X-Git-Url: http://git.rustad.me/?a=commitdiff_plain;h=f48c97c88d6aec2cfd639f67132d9630183daa20;p=duplo

Merge branch 'master' of /var/git/duplo
---

f48c97c88d6aec2cfd639f67132d9630183daa20