← Back to branch summary

~ubuntuone-pqm-team/amqp/stable

Viewing all changes in revision 406.

  • Committer: Ask Solem
  • Date: 2014-09-30 17:30:07 UTC
  • mfrom: (352.1.17)
  • Revision ID: git-v1:6b450de905ab8554ed31fff128af68d8dd831af9
Merge branch '1.4'

Conflicts:
        README.rst
        amqp/__init__.py
        amqp/connection.py

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: