]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1e197c 8adaa8e)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 20 Mar 2011 18:49:05 +0000 (19:49 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 20 Mar 2011 18:49:05 +0000 (19:49 +0100)

Trivial merge
Michael's tree of IPFire 3.x.