From: Michael Andreen <harv@ruin.nu>
Date: Sat, 12 Jan 2008 16:14:39 +0000 (+0100)
Subject: Merge branch 'master' of whale@ruin.nu:git/ND
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;ds=sidebyside;h=193d9ed10fea0563da8da5f54ec42f3068547dd4;hp=193d9ed10fea0563da8da5f54ec42f3068547dd4;p=ND.git

Merge branch 'master' of whale@ruin.nu:git/ND
---