]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 6246d21 48f989d)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into install-raid
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 30 Aug 2014 08:46:11 +0000 (10:46 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 30 Aug 2014 08:46:11 +0000 (10:46 +0200)

Trivial merge
IPFire 2.x development tree