From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 21 May 2010 18:46:51 +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=19ec7aade6758daef2f7dd1a757195460349679a;p=ipfire-3.x.git

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

19ec7aade6758daef2f7dd1a757195460349679a