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

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

05841fbb8bfb528af5593ced830c65c0e99e2f78