]> 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: 628e8c3 bbfeb48)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 May 2017 15:41:12 +0000 (16:41 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 May 2017 15:41:12 +0000 (16:41 +0100)

Trivial merge
IPFire 2.x development tree