From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon, 21 Mar 2011 18:56: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=5d08a33fb8bf6056b430629d08dce1647c09042e;p=ipfire-3.x.git

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

5d08a33fb8bf6056b430629d08dce1647c09042e