From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon, 28 Mar 2011 19:59:12 +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=65a52bd10d72e395a03eaf5038842dc03d493399;p=ipfire-3.x.git

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

65a52bd10d72e395a03eaf5038842dc03d493399