Avoid clash #7

Merged
merged 17 commits into from Dec 7, 2012

Conversation