]> 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: 6cf0f95 1e7a2fe)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 7 Apr 2014 14:49:33 +0000 (16:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 7 Apr 2014 14:49:33 +0000 (16:49 +0200)

Trivial merge
Timo's tree of IPFire 2.x