Merge: Correct detection of property name conflicts
authorJean Privat <jean@pryen.org>
Mon, 14 Apr 2014 12:57:55 +0000 (08:57 -0400)
committerJean Privat <jean@pryen.org>
Mon, 14 Apr 2014 12:57:55 +0000 (08:57 -0400)
Fixes #395
Pull-Request: #398


Trivial merge