]> 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: 9b4bd0e 3905a9b)
Merge branch 'next' into core63
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 3 Oct 2012 14:32:02 +0000 (16:32 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 3 Oct 2012 14:32:02 +0000 (16:32 +0200)

Trivial merge
Peter's tree of IPFire 2.x