]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 357b8c1 369a04a)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 10 Jun 2017 20:38:32 +0000 (22:38 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 10 Jun 2017 20:38:32 +0000 (22:38 +0200)

Trivial merge
IPFire 2.x development tree