[duplicity/f19: 4/4] Merge branch 'master' into f19

[Rahul Sundaram]

commit b129fc4ffe852119015f2b3a2b8dbbe2845e3ac0
Merge: f678fe0 70e0c49
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Tue May 13 09:06:42 2014 -0400

    Merge branch 'master' into f19

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