From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 25 Mar 2011 19:47:21 +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=6806cd1a92408166aeda9eab147d64c03782c4e9;p=ipfire-3.x.git

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

6806cd1a92408166aeda9eab147d64c03782c4e9