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

[Rahul Sundaram]

commit 87c156ff13d9d6f620b9855b217e81306e21360e
Merge: cce19db 7f0a697
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Mon Mar 18 22:48:00 2013 -0400

    Merge branch 'master' into el6

 .gitignore     |    2 ++
 duplicity.spec |   22 ++++++++++++++++++----
 sources        |    2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)
---