]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6b862d 77a04db)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 1 Apr 2011 17:14:04 +0000 (19:14 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 1 Apr 2011 17:14:04 +0000 (19:14 +0200)

Trivial merge
Alex's tree of IPFire 3.x