]> 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: 0ec5f23 095cbf4)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 8 Sep 2013 13:26:47 +0000 (15:26 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 8 Sep 2013 13:26:47 +0000 (15:26 +0200)

Trivial merge
Timo's tree of IPFire 2.x