CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:        /cvs
Module name:    ports
Changes by:     st...@cvs.openbsd.org   2009/12/13 05:23:57

Modified files:
        telephony/asterisk: Makefile 
        telephony/asterisk/pkg: PLIST-main 

Log message:
missing an app_conference @conflict