From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 May 2009 20:01:17 +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=8010e0bd37f065dfd0406fb5f2d4051e21432501;p=ipfire-3.x.git

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

8010e0bd37f065dfd0406fb5f2d4051e21432501