[lsyncd/epel7: 9/9] Merge branch 'master' into epel7

[Lubomir Rintel]

commit d284c225bf57f62dfc38c7733a8e7af4de3be5b4
Merge: 785f8a1 1186853
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Tue Nov 18 16:39:15 2014 +0100

    Merge branch 'master' into epel7

 0001-Sanitize-mv-arguments.patch |   46 ++++++++++++++++++++++++++++++++++++++
 lsyncd.spec                      |   29 ++++++++++++++++++-----
 2 files changed, 68 insertions(+), 7 deletions(-)
---