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

[Petr Lautrbach]

commit a955bb2b7aec2a5452c025899a4fc879deeca176
Merge: 392e4a4 62986c5
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Fri Dec 19 10:47:02 2014 +0100

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

 openssh-6.6.1p1-log-in-chroot.patch |  295 +++++++++++++++++++++++++++++++++++
 openssh.spec                        |    8 +-
 2 files changed, 302 insertions(+), 1 deletions(-)
---