sthen 96c476d90f mark conflict: astro/jday, net/netatalk		2013-01-09 23:06:24 +00:00
..
patches
pkg	mark conflict: astro/jday, net/netatalk	2013-01-09 23:06:24 +00:00
distinfo	mark conflict: astro/jday, net/netatalk	2013-01-09 23:06:24 +00:00
Makefile	mark conflict: astro/jday, net/netatalk	2013-01-09 23:06:24 +00:00