]> 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 | compact (merge: fb37597 b3acd7b)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 24 May 2013 19:54:51 +0000 (19:54 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 24 May 2013 19:54:51 +0000 (19:54 +0000)

Trivial merge
Timo's tree of IPFire 2.x