]> 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: 7ae2d8a 12f74b8)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Jan 2015 13:24:29 +0000 (14:24 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Jan 2015 13:24:29 +0000 (14:24 +0100)

Trivial merge
IPFire 2.x development tree