« back to all changes in this revision
Viewing changes to bzrlib/osutils.py
- Committer: John Arbash Meinel
- Date: 2010-01-05 05:09:45 UTC
- mfrom: (4634.117.12 2.0.4-pyrex-propagation)
- mto: This revision was merged to the branch mainline in revision 4936.
- Revision ID: john@arbash-meinel.com-20100105050945-itxiesuol1op6usy
Merge the 2.0 branch, resolve one conflict.
- files modified:
- NEWS
added
removed
bzrlib/osutils.py
