examples/app_skeleton/dist/conf/merb_init.rb in merb-0.0.5 vs examples/app_skeleton/dist/conf/merb_init.rb in merb-0.0.6

@@ -9,7 +9,8 @@
   :adapter => 'mysql',
   :username => 'root',
   :password => 'xxx',
   :database => 'merb'
 )
+ActiveRecord::Base.verification_timeout = 14400
 
 Dir[DIST_ROOT+"/app/models/*.rb"].each { |m| require m } 
\ No newline at end of file