]> 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 | compact (merge: 4598f16 be5b660)
Merge remote-tracking branch 'origin/next' into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 4 Oct 2013 14:55:20 +0000 (16:55 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 4 Oct 2013 14:55:20 +0000 (16:55 +0200)

Trivial merge
Timo's tree of IPFire 2.x