]> 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: fc25674 8c96ba3)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Thu, 31 Dec 2009 12:40:36 +0000 (13:40 +0100)
committerChristian Schmidt <maniacikarus@ipfire.org>
Thu, 31 Dec 2009 12:40:36 +0000 (13:40 +0100)

Trivial merge
IPFire 2.x development tree