]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 943e1f3 583c4f6)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 5 Dec 2014 23:18:54 +0000 (00:18 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 5 Dec 2014 23:18:54 +0000 (00:18 +0100)

Trivial merge
IPFire 3.x development tree