]> 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: 2e51e86 1ffbca6)
Merge branch 'core98' of git.ipfire.org:/pub/git/ipfire-2.x into core98
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Feb 2016 21:01:56 +0000 (22:01 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Feb 2016 21:01:56 +0000 (22:01 +0100)

Trivial merge
IPFire 2.x development tree