]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commitdiff
projects / people / stevee / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a300ee 0c265f5)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 29 Jul 2016 16:58:56 +0000 (18:58 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 29 Jul 2016 16:58:56 +0000 (18:58 +0200)

Trivial merge
Stefan's tree of IPFire 2.x.