evantahler/actionHero — pull request #280 by evantahler (2013-12-10 04:13:53+00:00)
Title: Spudz76 master

pulling in changes from @spudz76 and PR https://github.com/evantahler/actionHero/pull/277/

- solving merge conflicts