projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c4e34b 635ba6a)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Sun, 11 Apr 2010 17:45:04 +0000 (19:45 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Sun, 11 Apr 2010 17:45:04 +0000 (19:45 +0200)

Trivial merge
Peter's tree of IPFire 2.x