]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 438a331 90d9b60)
Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Nov 2012 18:50:35 +0000 (19:50 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Nov 2012 18:50:35 +0000 (19:50 +0100)

Trivial merge
Peter's tree of IPFire 2.x