sthen 96c476d90f mark conflict: astro/jday, net/netatalk		2013-01-09 23:06:24 +00:00
..
DESCR	update to 2.4 (three years of miscellaneous changes)	2006-11-02 21:30:57 +00:00
PFRAG.shared	update to 2.4 (three years of miscellaneous changes)	2006-11-02 21:30:57 +00:00
PLIST	mark conflict: astro/jday, net/netatalk	2013-01-09 23:06:24 +00:00