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

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

1f01639b857dd2637834b747bd92c5d8f9160dac