Geodan/cow — pull request #41 by stvno (2013-10-24 14:16:10+00:00)
Title: fixed issues with the merge

There were some minor issues with merge conflicts and missing files