]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4eb368f ccf1cb2)
Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 2 Jun 2014 18:31:20 +0000 (20:31 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 2 Jun 2014 18:31:20 +0000 (20:31 +0200)

Trivial merge
Timo's tree of IPFire 2.x