]> 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: d65e0bd 5137960)
Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 17 Dec 2012 09:16:46 +0000 (10:16 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 17 Dec 2012 09:16:46 +0000 (10:16 +0100)

Trivial merge
Timo's tree of IPFire 2.x