]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commitdiff
projects / people / stevee / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95d87c3 b88cd7c)
Merge branch 'master' into core65 v2.11-core65
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 17 Dec 2012 15:10:02 +0000 (16:10 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 17 Dec 2012 15:10:02 +0000 (16:10 +0100)

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