]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c836f5 7de1da3)
Merge remote-tracking branch 'origin/next' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 20 May 2012 15:14:56 +0000 (17:14 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 20 May 2012 15:14:56 +0000 (17:14 +0200)

Trivial merge
Timo's tree of IPFire 2.x