]> 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: 11ecfb9 d653b43)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 12 Oct 2016 20:52:34 +0000 (22:52 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 12 Oct 2016 20:52:34 +0000 (22:52 +0200)

Trivial merge
IPFire 2.x development tree