adium.1-4: 137815ad: Dropping conflicting file.

Wed Nov 4 22:10:37 EST 2009

-----------------------------------------------------------------
Revision: 137815adac27596bc92c5f5a1ecbc9773b9ab006
Ancestor: c61265200613217ab48c92ba7cae3a19def37f22
Author: zacw at adiumx.com
Date: 2009-11-05T03:02:46
Branch: im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/137815adac27596bc92c5f5a1ecbc9773b9ab006

Deleted entries:
        share/ca-certs/Entrust.net_Secure_Server_CA.pem

ChangeLog: 

Dropping conflicting file.