From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 9 Mar 2011 00:00:21 +0000 (+0100)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
X-Git-Tag: 0.7~1^2~2
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=be078ac9feafbf0eb7547ea14bb2e73936caa60c;hp=be078ac9feafbf0eb7547ea14bb2e73936caa60c;p=ashd.git

Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd

Conflicts:

	lib/mtio.c
---