]> 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: 191399a 15a2c03)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 15 Jun 2017 16:40:32 +0000 (18:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 15 Jun 2017 16:40:32 +0000 (18:40 +0200)

Trivial merge
IPFire 2.x development tree