]> 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 | combined (merge: 5292c03 68e2d32)
Merge remote-tracking branch 'stevee/axel-log-fix' into axel-fixperms
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 26 Jan 2013 17:54:44 +0000 (18:54 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 26 Jan 2013 17:54:44 +0000 (18:54 +0100)

Trivial merge
Peter's tree of IPFire 2.x