[librsync/el5: 19/19] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit a60858c693aae41123a157d952fbbff8676af424
Merge: d004843 153d2e0
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Mar 6 23:00:13 2015 +0100

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	librsync-0.9.7-getopt.patch
    	librsync.spec

 .gitignore                        |  3 +-
 librsync-0.9.7-getopt.patch       |  2 ++
 librsync-0.9.7-lfs_overflow.patch | 55 ----------------------------
 librsync.spec                     | 76 +++++++++++++++++++++++++++------------
 sources                           |  2 +-
 5 files changed, 59 insertions(+), 79 deletions(-)
---