#275: Please merge the more-kerberos branch into trunk -----------------------------+---------------------------------------------- Reporter: agx@sigxcpu.org | Owner: wsanchez@apple.com Type: Defect | Status: new Priority: 5: Not set | Milestone: Component: PyKerberos | Version: Severity: Other | Resolution: Keywords: | -----------------------------+---------------------------------------------- Comment (by wsanchez@apple.com): OK, quick merge isn't gonna happen cuz there are conflicts... A clean patch file would help. So might getting Guido commit access... -- Ticket URL: <https://trac.calendarserver.org/ticket/275#comment:1> CalendarServer </> HTTP/WebDAV/CalDAV Server