← Back to branch summary

~townsend/duplicity/fix-1161599

~townsend/duplicity/fix-1161599

Viewing all changes in revision 899.

Committer: Kenneth Loafman
Date: 2012-12-22 15:11:02 UTC
mfrom: (897.1.4 duplicity-src)
Revision ID: kenneth@loafman.com-20121222151102-vlagydkzr1tu15no

Merge changes from trunk.

files modified:
CHANGELOG

Changelog.GNU

bin/duplicity

bin/duplicity.1

duplicity/backends/gdocsbackend.py

duplicity/backends/u1backend.py

duplicity/commandline.py

duplicity/gpg.py

duplicity/gpginterface.py

testing/tests/finaltest.py

testing/tests/gpgtest.py

testing/tests/restarttest.py

Show diffs side-by-side

added added

removed removed

bin/duplicity.1

duplicity/backends/gdocsbackend.py

duplicity/backends/u1backend.py

duplicity/commandline.py

duplicity/gpg.py

duplicity/gpginterface.py

testing/tests/finaltest.py

testing/tests/gpgtest.py

testing/tests/restarttest.py

Older »