From: Bjørn Rustad <bjorn@rustad.me>
Date: Fri, 9 Aug 2013 23:51:34 +0000 (+0200)
Subject: Merge branch 'master' of /var/git/duplo
X-Git-Url: http://git.rustad.me/?a=commitdiff_plain;h=a8d5d85402cca9f514fbe7f410d7661b68926cec;p=duplo

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

a8d5d85402cca9f514fbe7f410d7661b68926cec