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

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

29e625374dfcf581b53bb5ad1dc24e7598b88432