]> 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: 0008a2d 33c56b4)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 8 Jan 2014 22:02:07 +0000 (23:02 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 8 Jan 2014 22:02:07 +0000 (23:02 +0100)

Trivial merge
Timo's tree of IPFire 2.x