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)
commitc83eeb4afcbee978c927d426f771339b468d014a
treee0c6c2990e4720087be1d2fdbde4b447185b26d2
parent6c3070e22124add461d88e576453b42787ec9e22
parentd860a416e76b60087a4b41e60a8938aad296106c
Merge: Correct detection of property name conflicts

Fixes #395
Pull-Request: #398