]> 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: 1d90e80 16454cf)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
authorStefan Schantl <stefan.schantl@ipfire.org>
Mon, 28 Mar 2011 19:59:12 +0000 (21:59 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Mon, 28 Mar 2011 19:59:12 +0000 (21:59 +0200)

Trivial merge
IPFire 3.x development tree