[duplicity/el6: 6/6] Merge branch 'master' into el6

[Rahul Sundaram]

commit 2db49cca18edb56fba7df169d0336e3784b1c711
Merge: b8c961e b1b3956
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Mon Dec 30 14:35:56 2013 -0500

    Merge branch 'master' into el6

 .gitignore                           |    4 +--
 duplicity-0.6.17-python24.patch      |   35 ----------------------------------
 duplicity-0.6.22-documentation.patch |   21 ++++++++++++++++++++
 duplicity.spec                       |    4 +-
 4 files changed, 24 insertions(+), 40 deletions(-)
---