]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6201ce6 28481f1)
Merge remote-tracking branch 'stevee/git-update' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 4 Jan 2013 14:10:07 +0000 (15:10 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 4 Jan 2013 14:10:07 +0000 (15:10 +0100)

Trivial merge
Timo's tree of IPFire 2.x