[rsnapshot/el6: 6/6] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 786156f24ea6724bd39418f7bedf30dd7ec7c924
Merge: 9c024d4 33f29db
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Jul 25 20:51:58 2012 +0200

    Merge remote branch 'origin/master' into el6

 rsnapshot.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---