projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1be052f 4e631b6)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 6 May 2014 11:21:40 +0000 (13:21 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 6 May 2014 11:21:40 +0000 (13:21 +0200)

Trivial merge
Timo's tree of IPFire 2.x