]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40c81f6 3bee566)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 17 Aug 2017 13:00:38 +0000 (15:00 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 17 Aug 2017 13:00:38 +0000 (15:00 +0200)

Trivial merge
Peter's tree of IPFire 2.x