]> 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: 1c6e776 5861450)
Merge branch 'next' into qemu0.15.0
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Aug 2011 14:54:46 +0000 (16:54 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Aug 2011 14:54:46 +0000 (16:54 +0200)

Trivial merge
Timo's tree of IPFire 2.x