]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d14d19e 6f5bb9b)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorManiacikarus <maniacikarus@ipfire.org>
Mon, 20 Oct 2008 14:54:30 +0000 (16:54 +0200)
committerManiacikarus <maniacikarus@ipfire.org>
Mon, 20 Oct 2008 14:54:30 +0000 (16:54 +0200)

Trivial merge
IPFire 2.x development tree