]> 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 | combined (merge: ecd0ac0 fe3a05d)
Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Fri, 26 Oct 2012 13:40:45 +0000 (15:40 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Fri, 26 Oct 2012 13:40:45 +0000 (15:40 +0200)

Trivial merge
Timo's tree of IPFire 2.x