From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 20 Mar 2011 18:49:05 +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=779fac8b479ae5c0ed76e11d11b5e28a63b2a89e;p=ipfire-3.x.git

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

779fac8b479ae5c0ed76e11d11b5e28a63b2a89e