Comment 1 for bug 1177688

I removed the asterisk_click2dial_* from extra-60 and extra-trunk. I hope it won't be re-created by the automatic translation stuff (It's probably what happened before, because I already removed asterisk_click2dial from these repos).

By the way, it's not a good idea to include extra-addons in your addons-path, because, with the migration of community modules outside of extra-addons, you will have plenty of these kind of conflicts. If you need a few modules from the extra-addons, you should not include extra-addons in your addons-path and use symlinks from a directory included in your addons-path.