From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 16 Sep 2014 18:45:35 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into install-raid
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5fe98feade7e6b2152197e0ed9bcef4e657064a;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into install-raid
---

f5fe98feade7e6b2152197e0ed9bcef4e657064a