Viewing all changes in revision 5000.

Committer: Canonical.com Patch Queue Manager
Date: 2010-02-03 09:04:38 UTC
mfrom: <a title="Merged From 4999.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/4999.1.1?remember=5247.3.15">(4999.1.1 integration)
Revision ID: pqm@pqm.ubuntu.com-20100203090438-2qn9wus9kyyfyyek

(vila) Merge 2.1 to trunk,
including fix for bug #515597 (per-file merge hook typo)

added added

removed removed