]> 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: bfa284b 9d05aa7)
Merge remote-tracking branch 'origin/core90'
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 21 May 2015 09:16:35 +0000 (11:16 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 21 May 2015 09:16:35 +0000 (11:16 +0200)

Trivial merge
IPFire 2.x development tree