]> 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: 504d7a7 c882707)
Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Jul 2011 20:30:47 +0000 (22:30 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Jul 2011 20:30:47 +0000 (22:30 +0200)

Trivial merge
Peter's tree of IPFire 2.x