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

[Petr Lautrbach]

commit e3dc63b80685249179ff6d1fbb7097974ae58a97
Merge: f6f4e6e 276c16c
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Wed Dec 3 18:20:45 2014 +0100

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

 openssh-5.8p1-localdomain.patch     |   14 -------
 openssh-6.6.1p1-cisco-dh-keys.patch |   70 +++++++++++++++++++++++++++++++++++
 openssh-6.6.1p1-localdomain.patch   |   12 ++++++
 openssh-6.6p1-fips.patch            |   25 ++++--------
 openssh-6.6p1-redhat.patch          |   11 +++--
 openssh.spec                        |   12 ++++-
 6 files changed, 106 insertions(+), 38 deletions(-)
---