]> 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: c5a5b13 da4529a)
Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Nov 2014 10:38:45 +0000 (11:38 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Nov 2014 10:38:45 +0000 (11:38 +0100)

Trivial merge
Peter's tree of IPFire 2.x