projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: e1aaecc fc5385b)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Tue, 8 Feb 2011 21:05:30 +0000 (22:05 +0100)
committerChristian Schmidt <maniacikarus@ipfire.org>
Tue, 8 Feb 2011 21:05:30 +0000 (22:05 +0100)

Trivial merge
Peter's tree of IPFire 2.x