]> 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: a421b80 65712de)
Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 2 Jun 2015 07:47:01 +0000 (09:47 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 2 Jun 2015 07:47:01 +0000 (09:47 +0200)

Trivial merge
IPFire 2.x development tree