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

[Petr Lautrbach]

commit b7e2bae5c424695e68ca8a2489def5edadfaf3ec
Merge: b496a68 30c06a0
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Sun Oct 26 22:50:54 2014 +0100

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

 openssh-6.6p1-kuserok.patch |  210 ++++++++++++++++++++++++++++++++++---------
 1 files changed, 168 insertions(+), 42 deletions(-)
---