]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bb154f b1839f5)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 25 Mar 2011 19:47:21 +0000 (20:47 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 25 Mar 2011 19:47:21 +0000 (20:47 +0100)

Trivial merge
IPFire 3.x development tree