]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6272b1b 7d6beb3)
Merge remote-tracking branch 'ms/install-raid' into install-raid
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 10 Oct 2014 13:03:45 +0000 (15:03 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 10 Oct 2014 13:03:45 +0000 (15:03 +0200)
Conflicts:
lfs/bash

1  2 
lfs/bash patch | diff1 | diff2 | blob | history

diff --cc lfs/bash
Simple merge
IPFire 2.x development tree