From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 10 Oct 2014 12:52:30 +0000 (+0200)
Subject: Merge branch 'master' into install-raid
X-Git-Url: http://git.ipfire.org/?p=people%2Fmfischer%2Fipfire-2.x.git;a=commitdiff_plain;h=6272b1b85e8812f131d8ccb3207665839ff01e13

Merge branch 'master' into install-raid

Conflicts:
	config/rootfiles/common/bash
	lfs/bash
---

6272b1b85e8812f131d8ccb3207665839ff01e13