Viewing all changes in revision 503.
- Committer: Jelmer Vernooij
- Date: 2011-01-31 18:43:32 UTC
- mfrom: (502.1.1 trunk)
- Revision ID: jelmer@samba.org-20110131184332-8br8nz7j09ozx220
merge error when merging already present versions.
- files modified:
- cmds.py
expand all
collapse all
added
removed
