]> 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: 077ea71 7331b24)
Merge branch 'core104' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 13 Sep 2016 17:41:36 +0000 (19:41 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 13 Sep 2016 17:41:36 +0000 (19:41 +0200)

Trivial merge
Peter's tree of IPFire 2.x