]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/commitdiff
projects / people / pmueller / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38309f0 43c69e2)
Merge remote-tracking branch 'stevee/openssh-6.1'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 8 Dec 2012 21:34:53 +0000 (22:34 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 8 Dec 2012 21:34:53 +0000 (22:34 +0100)

Trivial merge
Peter's tree of IPFire 3.x