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

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

2a54c7f30cd39024137cdc0db8953d0d2138999a