~bzr-pqm/bzr/bzr.dev

(vila) Merge 2.2 into trunk resolving conflicts and including fix for
bug #632465 (Vincent Ladeuil)

added added

removed removed

* Missing files (files bzr add'ed and then OS deleted) are now shown in ``bzr

status`` output. (Rory Yorke, #134168)

* ``NotBranchError`` no longer allows errors from calling

``bzrdir.open_repository()`` to propagate. This is unhelpful at best,

and at worst can trigger infinite loops in callers. (Andrew Bennetts)

* Windows installers no longer requires the Microsoft vcredist to be

installed. (Martin [gz], Gary van der Merwe, #632465)

Documentation

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