]> 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: c97dda3 744a04e)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 16 Sep 2015 18:28:53 +0000 (20:28 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 16 Sep 2015 18:28:53 +0000 (20:28 +0200)

Trivial merge
IPFire 2.x development tree