Merge branch 'master' of https://github.com/r888888888/danbooru

app/logical/cache.rb

@@ -63,7 +63,7 @@ class Cache
 
   def self.delete(key, delay = nil)
     start_time = Time.now
-    MEMCACHE.delete key, delay
+    MEMCACHE.delete key
     elapsed = Time.now - start_time
     ActiveRecord::Base.logger.debug('MemCache Delete (%0.6f)  %s' % [elapsed, key])
     nil

config/danbooru_default_config.rb

@@ -4,7 +4,7 @@ module Danbooru
   class Configuration
     # The version of this Danbooru.
     def version
-      "2.33.0"
+      "2.34.0"
     end
 
     # The name of this Danbooru.

db/structure.sql

@@ -6429,4 +6429,6 @@ INSERT INTO schema_migrations (version) VALUES ('20130620215658');
 
 INSERT INTO schema_migrations (version) VALUES ('20130712162600');
 
-INSERT INTO schema_migrations (version) VALUES ('20130914175431');
+INSERT INTO schema_migrations (version) VALUES ('20130914175431');
+
+INSERT INTO schema_migrations (version) VALUES ('20131006193238');