git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit

author	Michael Tremer <michael.tremer@ipfire.org>
	Fri, 10 Oct 2014 12:52:30 +0000 (14:52 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Fri, 10 Oct 2014 12:52:30 +0000 (14:52 +0200)
commit	6272b1b85e8812f131d8ccb3207665839ff01e13
tree	4d8ae4beb6be77e2c5f025cbe9d98eb734ac919a	tree \| snapshot
parent	93d6ac8a9dbc7e94ac7d99c3658d6a1a995de14c	commit \| diff
parent	215043936ebd50c4331ca6d9600dc7e93acd1bb4	commit \| diff

Merge branch 'master' into install-raid

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