]> 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: 426270e 592efb8)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <Arne_F@ipfire.org>
Thu, 1 Aug 2013 20:28:32 +0000 (22:28 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Thu, 1 Aug 2013 20:28:32 +0000 (22:28 +0200)

Trivial merge
Timo's tree of IPFire 2.x