[kde-runtime/f20: 16/16] Merge branch 'master' into f20

[Rex Dieter]

commit e50857bedb421c839f1a8bb7806552ff50291c1b
Merge: 96b043e 6f68236
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 19:49:56 2014 -0500

    Merge branch 'master' into f20

 .gitignore                                         |    5 +-
 ...11.95-initial_passwordless_kwallet_option.patch |   96 ------------
 ...libssh-0.6-0001-kio_sftp-Fix-error-values.patch |   90 ------------
 ...002-kio_sftp-Fix-printing-dest-in-the-log.patch |   34 -----
 ...bssh-0.6-0003-kio_sftp-Support-ECDSA-keys.patch |  154 --------------------
 kde-runtime.spec                                   |   68 ++++++---
 sources                                            |    2 +-
 7 files changed, 50 insertions(+), 399 deletions(-)
---