[librsync/el6: 13/13] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit f3b666587d90de8a0c1cb399dd8093e575768b8f
Merge: d063e2c 153d2e0
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Mar 6 22:57:55 2015 +0100

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                        |  3 +-
 librsync-0.9.7-getopt.patch       |  2 ++
 librsync-0.9.7-lfs_overflow.patch | 55 ------------------------------
 librsync-0.9.7-man_pages.patch    | 37 ---------------------
 librsync.spec                     | 70 +++++++++++++++++++++++++++------------
 sources                           |  2 +-
 6 files changed, 53 insertions(+), 116 deletions(-)
---