]> 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: 4ff6905 c023275)
Merge remote-tracking branch 'origin/master' into core89 v2.17-core89
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 14 Apr 2015 18:23:40 +0000 (20:23 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 14 Apr 2015 18:23:40 +0000 (20:23 +0200)

Trivial merge
IPFire 2.x development tree