]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24d36c8 474daba)
Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 7 Oct 2014 16:37:01 +0000 (18:37 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 7 Oct 2014 16:37:01 +0000 (18:37 +0200)

Trivial merge
IPFire 2.x development tree