]> 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: d2ff1cc 38ffd2d)
Merge branch 'core82' of ssh://git.ipfire.org/pub/git/ipfire-2.x into core82
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Aug 2014 15:06:40 +0000 (17:06 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Aug 2014 15:06:40 +0000 (17:06 +0200)

Trivial merge
Timo's tree of IPFire 2.x