merge mbp@sou | IN DEVELOPMENT
merge john@ar | 
              |   IMPROVEMENTS:
              | 
merge aaron.b |     * Aliases now support quotation marks, so they can contain whitespace
              |       (Marius Kruger)
merge john@ar | 
merge v.ladeu |     * PyCurlTransport now use a single curl object. By specifying explicitly
              |       the 'Range' header, we avoid the need to use two different curl objects
              |       (and two connections to the same server). (Vincent Ladeuil)
              | 
merge abentle |     * ``bzr commit`` does not prompt for a message until it is very likely to
              |       succeed.  (Aaron Bentley)
              | 
merge abentle |     * ``bzr conflicts`` now takes --text to list pathnames of text conflicts
merge john@ar |       (Aaron Bentley)
              | 
merge john@ar |     * Fix ``iter_lines_added_or_present_in_versions`` to use a set instead
              |       of a list while checking if a revision id was requested. Takes 10s
              |       off of the ``fileids_affected_by_revision_ids`` time, which is 10s
merge john@ar |       of the ``bzr branch`` time. Also improve ``fileids_...`` time by
              |       filtering lines with a regex rather than multiple ``str.find()``
              |       calls. (saves another 300ms) (John Arbash Meinel)
merge abentle | 
merge john@ar |     * Policy can be set for each configuration key. This allows keys to be
              |       inherited properly across configuration entries. For example, this
              |       should enable you to do::
              |         
              |         [/home/user/project]
              |         push_location = sftp://host/srv/project/