[CalendarServer-changes] [11910] PyCalendar/branches/json-2/

[source_changes at macosforge.org]

Revision: 11910
          http://trac.calendarserver.org//changeset/11910
Author:   cdaboo at apple.com
Date:     2013-11-07 18:19:57 -0800 (Thu, 07 Nov 2013)
Log Message:
-----------
Merge from trunk.

Property Changed:
----------------
    PyCalendar/branches/json-2/


Property changes on: PyCalendar/branches/json-2
___________________________________________________________________
Modified: svn:mergeinfo
   - /PyCalendar/branches/duplicate-items:10464-10465
/PyCalendar/branches/revised-api-126:10457-10463
/PyCalendar/branches/server:10466-10553
/PyCalendar/trunk:11324-11593
   + /PyCalendar/branches/duplicate-items:10464-10465
/PyCalendar/branches/revised-api-126:10457-10463
/PyCalendar/branches/server:10466-10553
/PyCalendar/trunk:11324-11900
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/b5cf51d3/attachment.html>