~bzr-pqm/bzr/bzr.dev

(gz) Merge 2.4 for feature flag conflict resolution and _Win32Stat fix
(Martin Packman)

added added

removed removed

* Prevent a traceback being printed to stderr when logging has problems and

accept utf-8 byte string without breaking. (Martin Packman, #714449)

* _Win32Stat object provides members st_uid and st_gid, those are present

in Python's os.stat object. These members required for external tools like

bzr-git and dulwich. (Alexander Belchenko, #967060)

Documentation

*************