]> 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: f8aa041 34f6a3f)
Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 4 Nov 2016 20:12:25 +0000 (21:12 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 4 Nov 2016 20:12:25 +0000 (21:12 +0100)

Trivial merge
IPFire 2.x development tree