]> 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: 986a6b7 ace40c9)
Merge remote-tracking branch 'origin/next' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Jul 2012 17:40:10 +0000 (19:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Jul 2012 17:40:10 +0000 (19:40 +0200)

Trivial merge
Peter's tree of IPFire 2.x