Ignore output/* and tmp/*
1.3 is out
Ditto
Ditto
Ditto
Ditto
Ditto
Ditto
Ditto
Ditto
Ditto
Ditto
Sync with upstream

Conflicts:
	articles/connecting_to_broker.md
	articles/connection_encryption_with_tls.md
	articles/durability.md
	articles/error_handling.md
	articles/getting_started.md
	articles/patterns_and_use_cases.md
	articles/rabbitmq_versions.md
	articles/testing_with_evented_spec.md
	articles/troubleshooting.md
	articles/working_with_exchanges.md
	articles/working_with_queues.md