]> 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: 89f7654 9ce3b85)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 5 Nov 2015 20:39:39 +0000 (21:39 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 5 Nov 2015 20:39:39 +0000 (21:39 +0100)

Trivial merge
Peter's tree of IPFire 2.x