[libssh2/f21: 5/5] Merge branch 'master' into f21

[Paul Howarth]

commit 62cea02db3150cd1cab5c239ac48a7108193e47d
Merge: 61ab33f 33cf970
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Mar 11 10:55:17 2015 +0000

    Merge branch 'master' into f21
    
    Conflicts:
    	libssh2.spec

 ...p-seek-Don-t-flush-buffers-on-same-offset.patch |  54 -----
 ...s-Along-error-path-reset-the-correct-stat.patch |  26 ---
 ...p-Add-support-for-fsync-OpenSSH-extension.patch | 223 ---------------------
 ...evert-window_size-explicit-adjustments-on.patch |  69 -------
 0005-channel.c-fix-a-use-after-free.patch          |  26 ---
 ...annel_write-client-spins-on-write-when-wi.patch |  45 -----
 ...-redid-window-handling-for-flow-control-r.patch | 146 --------------
 ...annel_read-fix-data-drop-when-out-of-wind.patch | 140 -------------
 ...2_channel_read-Honour-window_size_initial.patch |  62 ------
 0010-Set-default-window-size-to-2MB.patch          |  85 --------
 ...eive_window_adjust-store-windows-size-alw.patch |  66 ------
 ...nt_init-init-fd-to-LIBSSH2_INVALID_SOCKET.patch |  31 ---
 libssh2-1.3.0.tar.gz.asc                           |   7 -
 libssh2.spec                                       |  52 ++---
 sources                                            |   2 +-
 15 files changed, 14 insertions(+), 1020 deletions(-)
---