]> 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: ce284ff 3712f5e)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Jun 2015 19:42:38 +0000 (19:42 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Jun 2015 19:42:38 +0000 (19:42 +0000)

Trivial merge
IPFire 3.x development tree