pulibrary/pul-store — pull request #79 by kevinreiss (2014-02-16 18:32:20+00:00)
Title: Merge conflict fix

Okay. I apologize for the vague branch name here. I had to resolve the submodule conflict manually.