From: Bjørn Rustad <bjorn@rustad.me>
Date: Thu, 15 Aug 2013 19:27:00 +0000 (+0200)
Subject: Merge branch 'master' of /var/git/duplo
X-Git-Url: http://git.rustad.me/?a=commitdiff_plain;h=8e6af046009cc1a3dd265dda614a4f01ddbed26d;p=duplo

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

8e6af046009cc1a3dd265dda614a4f01ddbed26d