]> 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: e86c7a1 aebdc8e)
Merge branch 'x-server' of ssh://git.ipfire.org/pub/git/people/stevee/ipfire-3.x...
authorSchantl Stefan <Stevee@ipfire.org>
Fri, 27 Aug 2010 12:32:59 +0000 (14:32 +0200)
committerSchantl Stefan <Stevee@ipfire.org>
Fri, 27 Aug 2010 12:32:59 +0000 (14:32 +0200)

Trivial merge
IPFire 3.x development tree