projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50a84cd 378c207)
Merge branch 'reiser4'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 1 Aug 2010 20:00:37 +0000 (22:00 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 1 Aug 2010 20:00:37 +0000 (22:00 +0200)

Trivial merge
Peter's tree of IPFire 2.x