[openssh/f21: 8/8] Merge remote-tracking branch 'origin/master' into f21

[Petr Lautrbach]

commit 6a46008ce74b48bcedaec51794693282da8b6ac5
Merge: a955bb2 2109ab6
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Wed Jan 14 17:16:34 2015 +0100

    Merge remote-tracking branch 'origin/master' into f21

 openssh-6.6.1p1-ip-port-config-parser.patch      |   24 ++++
 openssh-6.6.1p1-scp-non-existing-directory.patch |   14 +++
 openssh-6.6p1-GSSAPIEnablek5users.patch          |  137 ++++++++++++++++++++++
 openssh-6.6p1-ldap.patch                         |    4 +-
 openssh.spec                                     |   22 +++-
 sshd.service                                     |    1 +
 sshd.socket                                      |    1 +
 sshd at .service                                    |    1 +
 8 files changed, 201 insertions(+), 3 deletions(-)
---