From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 18 Sep 2010 19:49:53 +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=0261d55ccb8a81296465731814e47d81070519c3;p=ipfire-3.x.git

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

0261d55ccb8a81296465731814e47d81070519c3