]> 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: 52dae2b f797c74)
Merge branch 'next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 16 Oct 2014 09:36:21 +0000 (11:36 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 16 Oct 2014 09:36:21 +0000 (11:36 +0200)
Conflicts:
make.sh


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