]> 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: 2cb3591 102d548)
Merge branch 'next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Mon, 1 Oct 2012 06:22:34 +0000 (08:22 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Mon, 1 Oct 2012 06:22:34 +0000 (08:22 +0200)

Trivial merge
Timo's tree of IPFire 2.x