From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 29 May 2009 13:44:06 +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=473d8fc649b87e03844f618bf9338c898abbdf46;p=ipfire-3.x.git

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

473d8fc649b87e03844f618bf9338c898abbdf46