]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 966e5b5 986a6b7)
Merge branch 'kernel-update' of git.ipfire.org:/pub/git/ipfire-2.x into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Jul 2012 21:16:47 +0000 (23:16 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Jul 2012 21:16:47 +0000 (23:16 +0200)

Trivial merge
IPFire 2.x development tree