From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 6 Jun 2010 12:57:00 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=458a706340ccd6bdc8b571e9b02281f760599396;p=ipfire-3.x.git

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

458a706340ccd6bdc8b571e9b02281f760599396