Viewing all changes in revision 6579.

Committer: Patch Queue Manager
Date: 2013-06-24 13:05:33 UTC
mfrom: <a title="Merged From 6578.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/6578.1.1?remember=6020">(6578.1.1 2.6-merges-2.5)
Revision ID: pqm@pqm.ubuntu.com-20130624130533-51c8htekjd8mix3u

(jameinel) Merge bzr/2.5 into trunk,
including the fix for bug #855155 (John A Meinel)

added added

removed removed