From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 May 2009 12:14:13 +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=b50d262db48f44f6fd3d91e10a52c165f1267b5a;p=ipfire-3.x.git

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

b50d262db48f44f6fd3d91e10a52c165f1267b5a