]> 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: 6993e8f 602cb8b)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 5 Jul 2017 06:05:13 +0000 (08:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 5 Jul 2017 06:05:13 +0000 (08:05 +0200)

Trivial merge
Peter's tree of IPFire 2.x