From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 1 Apr 2011 17:14:04 +0000 (+0200)
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=a8a6655dcf55033c6d75062d00a73c9a035376d5;p=ipfire-3.x.git

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

a8a6655dcf55033c6d75062d00a73c9a035376d5