]> 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: 48a6b01 cd5e30a)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorManiacikarus <maniacikarus@ipfire.org>
Wed, 7 Jan 2009 19:02:13 +0000 (20:02 +0100)
committerManiacikarus <maniacikarus@ipfire.org>
Wed, 7 Jan 2009 19:02:13 +0000 (20:02 +0100)

Trivial merge
IPFire 2.x development tree