]> 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: 080ce04 d5e982c)
Merge commit 'origin/next' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 14 Mar 2012 09:37:16 +0000 (10:37 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 14 Mar 2012 09:37:16 +0000 (10:37 +0100)

Trivial merge
Peter's tree of IPFire 2.x