]> 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: 11bc3c6 0b7f6aa)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 14 Oct 2013 12:56:20 +0000 (14:56 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 14 Oct 2013 12:56:20 +0000 (14:56 +0200)

Trivial merge
Timo's tree of IPFire 2.x