From: Jean Privat <jean@pryen.org>
Date: Mon, 14 Apr 2014 12:57:55 +0000 (-0400)
Subject: Merge: Correct detection of property name conflicts
X-Git-Tag: v0.6.6~113
X-Git-Url: http://nitlanguage.org?hp=-c

Merge: Correct detection of property name conflicts

Fixes #395
Pull-Request: #398
---

c83eeb4afcbee978c927d426f771339b468d014a