[duplicity/el5: 4/4] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit e06f65aaa1a5c45f43ac53179f62ede4c9679c1d
Merge: 98742e2 f33ba20
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Apr 8 22:48:42 2012 +0200

    Merge remote branch 'origin/master' into el5

 .gitignore     |    3 +--
 duplicity.spec |    8 +++++++-
 sources        |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---