newshorts/directory — pull request #1 by newshorts (2013-03-23 05:19:40+00:00)
Title: Importing ben's changes

merging changes to master then I'll set up a new repo on GSPBetaGroup