hawkthorne/hawkthorne-journey — pull request #2251 by edisonout (2014-10-11 07:18:51+00:00)
Title: Cleanup merge

Fixes last merge issue with #2203. Sorry, I'm being impatient.