]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f9fb7a 357b8c1)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Thu, 8 Jun 2017 12:03:56 +0000 (14:03 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Thu, 8 Jun 2017 12:03:56 +0000 (14:03 +0200)

Trivial merge
Peter's tree of IPFire 2.x