JacksonRiver/springboard_modules — pull request #656 by epicflux (2014-12-01 15:37:51+00:00)
Title: Remove committed conflict in SB Social

This removes a conflict that made its way into SB Social in the 4.5 release.