projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51d002b bfc35ba)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <christian.schmidt@ipfire.org>
Sun, 2 May 2010 20:19:18 +0000 (22:19 +0200)
committerChristian Schmidt <christian.schmidt@ipfire.org>
Sun, 2 May 2010 20:19:18 +0000 (22:19 +0200)

Trivial merge
Peter's tree of IPFire 2.x