pulibrary/pul-store-models — pull request #6 by kevinreiss (2014-02-16 18:33:47+00:00)
Title: Merge conflict fix

Corresponding PR for https://github.com/pulibrary/pul-store/pull/79. Sorry for the vague branch name. I should have numbered it.