]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: e55a2b8 cab25d6)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorManiacikarus <maniacikarus@ipfire.org>
Fri, 12 Dec 2008 22:49:36 +0000 (23:49 +0100)
committerManiacikarus <maniacikarus@ipfire.org>
Fri, 12 Dec 2008 22:49:36 +0000 (23:49 +0100)

Trivial merge
Peter's tree of IPFire 2.x