From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 23 Apr 2009 21:37:28 +0000 (+0200)
Subject: Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc424798e82275ff658bac71b4ead94e28fe90da;p=ipfire-3.x.git

Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
	lfs/shadow
---

dc424798e82275ff658bac71b4ead94e28fe90da