projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ebf8d1 ff740a7)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 1 Feb 2014 12:38:58 +0000 (13:38 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 1 Feb 2014 12:38:58 +0000 (13:38 +0100)

Trivial merge
Timo's tree of IPFire 2.x