From: Bjørn Rustad <bjorn@rustad.me>
Date: Fri, 30 Sep 2011 13:20:16 +0000 (+0200)
Subject: Merge branch 'master' of ssh://rustad.me/var/git/nummat1
X-Git-Url: http://git.rustad.me/?a=commitdiff_plain;h=096e227978965b48c94581a134522b88c25ae6f3;p=nummat1

Merge branch 'master' of ssh://rustad.me/var/git/nummat1
---

096e227978965b48c94581a134522b88c25ae6f3