]> 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: 03d7921 2950a55)
Merge remote-tracking branch 'origin/core66' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 17 Feb 2013 12:15:34 +0000 (13:15 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 17 Feb 2013 12:15:34 +0000 (13:15 +0100)

Trivial merge
Peter's tree of IPFire 2.x