]> 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: c899b16 9a6be06)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 Apr 2016 20:48:32 +0000 (21:48 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 Apr 2016 20:48:32 +0000 (21:48 +0100)

Trivial merge
IPFire 2.x development tree