]> git.ipfire.org Git - people/jschlag/ipfire-2.x.git/commitdiff
projects / people / jschlag / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 645378f d651e48)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Feb 2016 01:33:15 +0000 (01:33 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Feb 2016 01:33:15 +0000 (01:33 +0000)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.