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

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

cf5915fb1137dec1436db01429a1655eccc87543