Revision: 4314 http://trac.macosforge.org/projects/calendarserver/changeset/4314 Author: wsanchez@apple.com Date: 2009-06-03 14:34:19 -0700 (Wed, 03 Jun 2009) Log Message: ----------- Merge forward, hopefully last time. Added Paths: ----------- CalendarServer/branches/exarkun/update-twisted-3816-4/ Property changes on: CalendarServer/branches/exarkun/update-twisted-3816-4 ___________________________________________________________________ Added: svn:ignore + .dependencies *.tgz data logs build *.pyc *.pyo Added: svn:mergeinfo + /CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067 /CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075