pivotal/cedar — pull request #142 by jeffh (2013-11-26 07:34:41+00:00)
Title: Merged latest master with pr/140.

Merged #140 into master (which contains #141).

@akitchen, you might like to review the merge. I resolved the obvious merge conflicts:
- `+ (void)clearSpyInfoForObject:(id)object;` declaration in the headers
- `self.originalObject` if-guard in the CDRSpyInfo's dealloc