]> 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: f707295 c6bc0fb)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 11 Nov 2016 06:44:38 +0000 (07:44 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 11 Nov 2016 06:44:38 +0000 (07:44 +0100)

Trivial merge
IPFire 2.x development tree