Viewing all changes in revision 5967.7.2.
- Committer: Martin Pool
- Date: 2011-06-19 02:24:39 UTC
- mfrom: (5985 +trunk)
- mto: This revision was merged to the branch mainline in revision 6001.
- Revision ID: mbp@canonical.com-20110619022439-u68683yb2bw302x0
resolve conflicts against trunk
- files added:
- doc/en/user-guide/gpg_signatures.txt
- files modified:
- bzrlib/__init__.py
expand all
collapse all
added
removed
