]> git.ipfire.org Git - people/dweismueller/ipfire-2.x.git/commitdiff
projects / people / dweismueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f6e429 b154ded)
Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Nov 2014 17:36:31 +0000 (18:36 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Nov 2014 17:36:31 +0000 (18:36 +0100)

Trivial merge
Daniel's tree of IPFire 2.x.