]> 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: 416bf5f efa808b)
Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 30 Sep 2014 07:32:01 +0000 (09:32 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 30 Sep 2014 07:32:01 +0000 (09:32 +0200)

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