Merge remote-tracking branch 'ocramius/mvc-router-from-locator'
authorEvan Coury <me@evancoury.com>
Thu, 9 Feb 2012 20:20:27 +0000 (13:20 -0700)
committerEvan Coury <me@evancoury.com>
Thu, 9 Feb 2012 20:20:27 +0000 (13:20 -0700)

Trivial merge