]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d77dfa7 6cda03e)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Dec 2014 11:45:13 +0000 (12:45 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Dec 2014 11:45:13 +0000 (12:45 +0100)

Trivial merge
IPFire 2.x development tree