]> 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: 4ffb9f9 b580a05)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 1 Apr 2016 11:29:40 +0000 (13:29 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 1 Apr 2016 11:29:40 +0000 (13:29 +0200)

Trivial merge
IPFire 2.x development tree