From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 24 Jul 2009 14:41: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=980f6cb7467830180a8ff3c450ad4f718221f6dd;p=ipfire-3.x.git

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

980f6cb7467830180a8ff3c450ad4f718221f6dd