From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 22 May 2009 10:39:11 +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=459ebd919992b78369afa04829382196259bbddb;p=ipfire-3.x.git

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

459ebd919992b78369afa04829382196259bbddb