]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: db151fd c5a5e4a)
Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 28 Sep 2015 16:40:32 +0000 (18:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 28 Sep 2015 16:40:32 +0000 (18:40 +0200)

Trivial merge
IPFire 2.x development tree