]> 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: fe875de 0309f65)
Merge remote-tracking branch 'ummeegge/mtr'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 21:42:28 +0000 (22:42 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 21:42:28 +0000 (22:42 +0100)

Trivial merge
IPFire 2.x development tree