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

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

cfa25e25a8757b08be0c03cfaa07b2be3648a3b0