]> 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: 251cde3 b3b5bbb)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 1 Apr 2016 18:13:17 +0000 (19:13 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 1 Apr 2016 18:13:17 +0000 (19:13 +0100)

Trivial merge
IPFire 2.x development tree