]> 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: c356c8c 1a26eca)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 30 Apr 2016 13:34:16 +0000 (09:34 -0400)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 30 Apr 2016 13:34:16 +0000 (09:34 -0400)

Trivial merge
Peter's tree of IPFire 2.x