Viewing all changes in revision 5138.
- Committer: John Arbash Meinel
- Date: 2012-09-14 07:08:33 UTC
- mfrom: (4797.95.9 2.1-all-reconnect-819604)
- Revision ID: john@arbash-meinel.com-20120914070833-om0l2637zl7u1vg3
Merge 2.1-all-reconnect-819604 and resolve conflicts.
Most of the failures are just from copyright and import headers.
The code is now closer to the 2.5 version, since it has the AlreadyConnected medium.
Most of the failures are just from copyright and import headers.
The code is now closer to the 2.5 version, since it has the AlreadyConnected medium.
expand all
collapse all
added
removed
