CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:        /cvs
Module name:    ports
Changes by:     es...@cvs.openbsd.org   2015/06/08 07:44:28

Modified files:
        telephony/asterisk-sounds/extra-sounds: Makefile.inc 
        telephony/asterisk-sounds/extra-sounds/pkg: PLIST-en PLIST-en_GB 
                                                    PLIST-fr 

Log message:
fix conflict markers and bump, as discussed with sthen@