]> 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: 01183cc ef7686b)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 24 Jun 2014 06:05:39 +0000 (08:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 24 Jun 2014 06:05:39 +0000 (08:05 +0200)

Trivial merge
Timo's tree of IPFire 2.x