jbmilgrom/social_pocket — pull request #1 by NSCHUB01 (2014-07-17 12:20:50+00:00)
Title: Merge conflict resolved

pray to god