jasonrclark/shoes4 — pull request #1 by PragTob (2013-09-26 17:52:09+00:00)
Title: Merge in master branch

This should correctly resolve merge conflicts from the master branch and import all the changes.