atlasapi/atlas-model — pull request #56 by tfm (2012-07-13 10:44:03+00:00)
Title: Added Magpie and Voila publishers and removed publisher key size limit

Conflicts:

src/main/java/org/atlasapi/media/entity/Publisher.java