]> 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: 159c9eb 374e636)
Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 22 Oct 2015 21:38:27 +0000 (23:38 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 22 Oct 2015 21:38:27 +0000 (23:38 +0200)

Trivial merge
IPFire 2.x development tree