[27569] in Source-Commits
python-discuss commit [debian]: Merge branch 'master' into debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Feb 3 13:57:29 2014
Date: Mon, 3 Feb 2014 13:57:22 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201402031857.s13IvMDW010976@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/python-discuss/commit/c06c2681f77d2ade87c238934a0868812fcf12f0
commit c06c2681f77d2ade87c238934a0868812fcf12f0
Merge: fe97cd6 457f4d5
Author: Jonathan Reed <jdreed@mit.edu>
Date: Thu Jan 30 14:18:15 2014 -0500
Merge branch 'master' into debian
discuss/__init__.py | 1 +
discuss/client.py | 46 +++++++++++++++++++++++++++++-
discuss/locator.py | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++
discuss/rcfile.py | 16 ++++++++---
etc/meetings.default | 2 +
etc/servers | 5 +++
setup.py | 4 ++-
7 files changed, 141 insertions(+), 7 deletions(-)