rickychilcott/munkiserver — pull request #2 by treydock (2012-03-06 21:53:24+00:00)
Title: Rails 3.1/3.2 Final

This is a rebase with Jordan's master branch...may not be the right approach to doing this, but thought it might save some time resolving the various merge conflicts.