]> git.ipfire.org Git - people/dweismueller/ipfire-2.x.git/commitdiff
projects / people / dweismueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4afa6d a413026)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Jan 2012 20:24:25 +0000 (21:24 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Jan 2012 20:24:25 +0000 (21:24 +0100)

Trivial merge
Daniel's tree of IPFire 2.x.