]> 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: e8a408f 979444c)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
authorStefan Schantl <stefan.schantl@ipfire.org>
Sat, 26 Mar 2011 15:28:03 +0000 (16:28 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sat, 26 Mar 2011 15:28:03 +0000 (16:28 +0100)

Trivial merge
IPFire 3.x development tree