Merchello/Merchello — pull request #664 by BatJan (2014-06-12 15:59:01+00:00)
Title: Deleted duplicate key entry from line 308

The keys in line 307 and 308 were identical - So deleted the one on line 308.