]> 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: 12a8cc1 3d08d93)
Merge remote-tracking branch 'ms/thirteen' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 20 Jul 2012 07:08:40 +0000 (09:08 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 20 Jul 2012 07:08:40 +0000 (09:08 +0200)

Trivial merge
Peter's tree of IPFire 2.x