6785a05d5388052981863246756711ba447b3485 dc6e32a5cea29e9055463f6eff84f2b829a19c1c bmizerany blake.mizerany@gmail.com http://github.com/adamwiggins/sinatra/commit/ea3239c88f8a85f82cc891589bc6ad1c339719e8 ea3239c88f8a85f82cc891589bc6ad1c339719e8 2008-05-27T19:41:15-07:00 2008-05-27T19:41:15-07:00 Merge branch 'erb_locals' of git://github.com/cschneid/sinatra into cschneid/erb_locals 5da183f1d21dd7ed5ff8842707ff4193bd612dec bmizerany blake.mizerany@gmail.com