Viewing all changes in revision 329.1.12.
- Committer: Matt Nordhoff
- Date: 2009-05-05 18:01:25 UTC
- mfrom: (339 trunk)
- mto: (389.2.2 pep8-2009-10)
- mto: This revision was merged to the branch mainline in revision 392.
- Revision ID: mnordhoff@mattnordhoff.com-20090505180125-09yuufnnpzo0jr0m
Merge trunk, fixing conflicts
I should check that the imports I removed aren't being used in the new code, but I didn't.
I should check that the imports I removed aren't being used in the new code, but I didn't.
- files renamed:
- loggerhead/apps/filesystem.py => loggerhead/apps/transport.py
- files modified:
- NEWS
expand all
collapse all
added
removed
