]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60984f8 7535861)
Merge branch 'master' into kernel-test
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 20 Jul 2014 19:06:11 +0000 (21:06 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 20 Jul 2014 19:06:11 +0000 (21:06 +0200)

Trivial merge
Peter's tree of IPFire 2.x