← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/apps/transport.py

  • Committer: John Arbash Meinel
  • Date: 2011-03-16 12:24:06 UTC
  • mfrom: (436 trunk-rich)
  • mto: This revision was merged to the branch mainline in revision 438.
  • Revision ID: john@arbash-meinel.com-20110316122406-xdv5771vlih6s76q
Merge trunk and resolve NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/apps/transport.py
1
 
# Copyright (C) 2008, 2009 Canonical Ltd.
 
1
# Copyright (C) 2008-2011 Canonical Ltd.
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by