Fix require problem with the acts_as_taggable patches

app/controllers/tags_controller.rb

@@ -1,7 +1,7 @@
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-require File.join(Rails.root, 'app', 'models', 'acts_as_taggable_on_tag')
+require File.join(Rails.root, 'app', 'models', 'acts_as_taggable_on', 'tag')
 require File.join(Rails.root, 'lib', 'stream', 'tag')
 
 class TagsController < ApplicationController

lib/diaspora/taggable.rb

@@ -2,6 +2,8 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
+require File.join(Rails.root, "app", "models", "acts_as_taggable_on", "tag")
+
 module Diaspora
   module Taggable
     def self.included(model)