[MERGE] Merge directive format 2, Bundle format 4

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
> Aaron Bentley wrote:
>> I have made a bunch of the changes you requested.  Here's a merge directive.
> 
>> Additionally, I've introduced a new "submit" command, as a successor to
>> "bundle" and "merge-directive".  "bundle" is now an alias for "submit",
>> and "merge-directive" is hidden.
> 
> I've merged from bzr.dev, so here's an updated bundle.

Over the past few weeks, repeated attempts to get someone to review this
have failed.  Therefore, I have merged it.

If you don't like something about it:
a) you should have reviewed it
b) please submit a merge request.

Needless to say, this process has been quite frustrating to me.  In the
future, I will probably merge things like this more quickly, so they
don't get bitrotten.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGn5If0F+nu1YWqI0RAtKSAJ42VSK0P6/uhcyWEtj3XJ2Bf8TFiwCfcurT
RcQ09jEPv9MqmO7701y7DNk=
=lJcg
-----END PGP SIGNATURE-----