]> git.ipfire.org Git - people/trikolon/ipfire-2.x.git/commitdiff
projects / people / trikolon / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d4bb3c a722eae)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 16 Jul 2015 10:25:43 +0000 (12:25 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 16 Jul 2015 10:25:43 +0000 (12:25 +0200)

Trivial merge
Ben's tree of IPFire 2.x.