github/rails — pull request #61 by charliesome (2014-04-20 01:23:17+00:00)
Title: [3.0+AR3.1] Backport broken where merge fix

Backporting #60 into the `3-0-github+ar-3-1` branch.

cc @github/rails @github/rails3