]> 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: f0a4269 9724a0b)
Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 6 Nov 2012 23:01:32 +0000 (00:01 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 6 Nov 2012 23:01:32 +0000 (00:01 +0100)

Trivial merge
Peter's tree of IPFire 2.x