soif/Caller-ID-Superfecta — pull request #3 by tm1000 (2012-11-20 08:47:39+00:00)
Title: Do this to fix your merge conflicts

See above