From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 21 Jun 2010 09:50:14 +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=c5ac563e850a54964ff4aae726078c3c78d6a032;p=ipfire-3.x.git

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

c5ac563e850a54964ff4aae726078c3c78d6a032