From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 26 Mar 2011 15:28:03 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05d6cc82b26db50e41e34fe38817de48b9510c96;p=ipfire-3.x.git

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

05d6cc82b26db50e41e34fe38817de48b9510c96