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

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

b623b9d5b573c682ffb8aa2429cc3c0bd748640f