<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>app/models/feather/activity.rb</filename>
    </added>
    <added>
      <filename>app/models/feather/article.rb</filename>
    </added>
    <added>
      <filename>app/models/feather/configuration.rb</filename>
    </added>
    <added>
      <filename>app/models/feather/plugin.rb</filename>
    </added>
    <added>
      <filename>app/models/feather/plugin_setting.rb</filename>
    </added>
    <added>
      <filename>app/models/feather/user.rb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/articles/_article.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/articles/_form.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/articles/edit.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/articles/index.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/articles/new.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/articles/show.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/configurations/show.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/configurations/update.js.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/dashboards/show.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/plugins/_plugin.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/plugins/index.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/plugins/new.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/plugins/show.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/admin/plugins/update.js.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/articles/_article.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/articles/index.html.erb</filename>
    </added>
    <added>
      <filename>app/views/feather/articles/show.html.erb</filename>
    </added>
    <added>
      <filename>lib/feather.rb</filename>
    </added>
    <added>
      <filename>lib/feather/cache_helper.rb</filename>
    </added>
    <added>
      <filename>lib/feather/database.rb</filename>
    </added>
    <added>
      <filename>lib/feather/hooks.rb</filename>
    </added>
    <added>
      <filename>lib/feather/hooks/events.rb</filename>
    </added>
    <added>
      <filename>lib/feather/hooks/formatters.rb</filename>
    </added>
    <added>
      <filename>lib/feather/hooks/menu.rb</filename>
    </added>
    <added>
      <filename>lib/feather/hooks/view.rb</filename>
    </added>
    <added>
      <filename>lib/feather/merbtasks.rb</filename>
    </added>
    <added>
      <filename>lib/feather/padding.rb</filename>
    </added>
    <added>
      <filename>lib/feather/plugin_dependencies.rb</filename>
    </added>
    <added>
      <filename>lib/feather/slicetasks.rb</filename>
    </added>
    <added>
      <filename>lib/feather/spectasks.rb</filename>
    </added>
    <added>
      <filename>lib/tasks/slice.rake</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -17,3 +17,4 @@ src/*
 .hg/*
 .svn/*
 config/database.yml
+pkg/*</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -1,70 +1,74 @@
-module Admin
-  class Articles &lt; Base
-    before :find_article, :only =&gt; %w(edit update delete show)
-    def index
-      @articles = Article.paginate(:page =&gt; params[:page], :per_page =&gt; 10, :order =&gt; [:created_at.desc])
-      display @articles
-    end
+require File.join(File.dirname(__FILE__), &quot;base&quot;)
+
+module Feather
+  module Admin
+    class Articles &lt; Base
+      before :find_article, :only =&gt; %w(edit update delete show)
+      def index
+        @page_count, @articles = Feather::Article.paginated(:page =&gt; params[:page], :per_page =&gt; 10, :order =&gt; [:created_at.desc])
+        display @articles
+      end
     
-    def show
-      display @article
-    end
+      def show
+        display @article
+      end
     
-    def new
-      only_provides :html
-      @article = Article.new
-      display @article
-    end
+      def new
+        only_provides :html
+        @article = Feather::Article.new
+        display @article
+      end
     
-    def create(article)
-      @article = Article.new(article)
-      @article.user_id = session.user_id
-      if @article.save
-        # Expire the article index to reflect the newly published article
-        # expire_index if @article.published
-          render_then_call(redirect(url(:admin_articles))) do
-            @article.time_zone = session.user.time_zone
-          end
-          # Call events after the redirect
-          # Hooks::Events.after_publish_article_request(@article, request) if @article.published?
-          # Hooks::Events.after_create_article_request(@article, request)
-        # end
-      else
-        render :new
+      def create(article)
+        @article = Feather::Article.new(article)
+        @article.user_id = session[:user].id
+        if @article.save
+          # Expire the article index to reflect the newly published article
+          # expire_index if @article.published
+            render_then_call(redirect(url(:admin_articles))) do
+              @article.time_zone = session.user.time_zone
+            end
+            # Call events after the redirect
+            # Feather::Hooks::Events.after_publish_article_request(@article, request) if @article.published?
+            # Feather::Hooks::Events.after_create_article_request(@article, request)
+          # end
+        else
+          render :new
+        end
       end
-    end
     
-    def edit
-      display @article
-    end
+      def edit
+        display @article
+      end
+    
+      def update(article)
+        if @article.update_attributes(article)
+          # Expire the index and article to reflect the updated article
+          # expire_index
+          # expire_article(@article)
+          render_then_call(redirect(url(:admin_article, @article))) do
+            # Call events after the redirect
+            Feather::Hooks::Events.after_publish_article_request(@article, request) if @article.published?
+            Feather::Hooks::Events.after_update_article_request(@article, request)
+          end
+        else
+           display @article, :edit
+           # render :edit
+        end
+      end
     
-    def update(article)
-      if @article.update_attributes(article)
-        # Expire the index and article to reflect the updated article
+      def delete
+        @article.destroy
+        # Expire the index and article to reflect the removal of the article
         # expire_index
         # expire_article(@article)
-        render_then_call(redirect(url(:admin_article, @article))) do
-          # Call events after the redirect
-          Hooks::Events.after_publish_article_request(@article, request) if @article.published?
-          Hooks::Events.after_update_article_request(@article, request)
-        end
-      else
-         display @article, :edit
-         # render :edit
+        redirect url(:admin_articles)
       end
-    end
     
-    def delete
-      @article.destroy
-      # Expire the index and article to reflect the removal of the article
-      # expire_index
-      # expire_article(@article)
-      redirect url(:admin_articles)
+      private
+        def find_article
+          @article = Feather::Article[params[:id]]
+        end
     end
-    
-    private
-      def find_article
-        @article = Article[params[:id]]
-      end
   end
-end
+end
\ No newline at end of file</diff>
      <filename>app/controllers/admin/articles.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,8 @@
-module Admin
-  class Base &lt; Application
-    layout :admin
-    before :ensure_authenticated
+module Feather
+  module Admin
+    class Base &lt; Application
+      layout :admin
+      before :ensure_authenticated
+    end
   end
-end
+end
\ No newline at end of file</diff>
      <filename>app/controllers/admin/base.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,26 +1,30 @@
-module Admin
-  class Configurations &lt; Base
-    before :find_configuration
+require File.join(File.dirname(__FILE__), &quot;base&quot;)
+
+module Feather
+  module Admin
+    class Configurations &lt; Base
+      before :find_configuration
     
-    def show
-      display @configuration
-    end
-    
-    def update
-      @configuration.title = params[:title] unless params[:title].nil?
-      @configuration.tag_line = params[:tag_line] unless params[:tag_line].nil?
-      @configuration.about = params[:about] unless params[:about].nil?
-      @configuration.about_formatter = params[:about_formatter] unless params[:about_formatter].nil?
-      @configuration.permalink_format = params[:permalink_format] unless params[:permalink_format].nil?
-      @configuration.save
-      # Expire all pages as the configuration settings affect the overall template
-      expire_all_pages
-      render_js
-    end
+      def show
+        display @configuration
+      end
     
-    private
-      def find_configuration
-        @configuration = Configuration.current
+      def update
+        @configuration.title = params[:title] unless params[:title].nil?
+        @configuration.tag_line = params[:tag_line] unless params[:tag_line].nil?
+        @configuration.about = params[:about] unless params[:about].nil?
+        @configuration.about_formatter = params[:about_formatter] unless params[:about_formatter].nil?
+        @configuration.permalink_format = params[:permalink_format] unless params[:permalink_format].nil?
+        @configuration.save
+        # Expire all pages as the configuration settings affect the overall template
+        # expire_all_pages
+        render_js
       end
+    
+      private
+        def find_configuration
+          @configuration = Feather::Configuration.current
+        end
+    end
   end
-end
+end
\ No newline at end of file</diff>
      <filename>app/controllers/admin/configurations.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,23 +1,27 @@
-module Admin
-  class Dashboards &lt; Base
-    before :check_for_user
-    skip_before :ensure_authenticated
+require File.join(File.dirname(__FILE__), &quot;base&quot;)
+
+module Feather
+  module Admin
+    class Dashboards &lt; Base
+      before :check_for_user
+      skip_before :ensure_authenticated
     
-    def show
-      @activity = Activity.all(:order =&gt; [:created_at.desc], :limit =&gt; 5)
-      display @activity
-    end
+      def show
+        @activity = Feather::Activity.all(:order =&gt; [:created_at.desc], :limit =&gt; 5)
+        display @activity
+      end
     
-    private
-      ##
-      # This checks to see if there are no users (such as when it's a fresh install) - if so, it creates a default user and redirects the user to login with those details
-      def check_for_user
-        if User.count == 0
-          User.create!({:login =&gt; &quot;admin&quot;, :password =&gt; &quot;password&quot;, :password_confirmation =&gt; &quot;password&quot;, :name =&gt; 'blog owner', :email =&gt; &quot;none@none&quot;, :time_zone =&gt; &quot;Europe/London&quot;})
-          # Display the newly created users details
-          notify &quot;No users found so created the default user, \&quot;admin\&quot;, password is \&quot;password\&quot;.&quot;
+      private
+        ##
+        # This checks to see if there are no users (such as when it's a fresh install) - if so, it creates a default user and redirects the user to login with those details
+        def check_for_user
+          if Feather::User.count == 0
+            Feather::User.create!({:login =&gt; &quot;admin&quot;, :password =&gt; &quot;password&quot;, :password_confirmation =&gt; &quot;password&quot;, :name =&gt; 'blog owner', :email =&gt; &quot;none@none&quot;, :time_zone =&gt; &quot;Europe/London&quot;})
+            # Display the newly created users details
+            notify &quot;No users found so created the default user, \&quot;admin\&quot;, password is \&quot;password\&quot;.&quot;
+          end
+          ensure_authenticated
         end
-        ensure_authenticated
-      end
+    end
   end
-end
+end
\ No newline at end of file</diff>
      <filename>app/controllers/admin/dashboards.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,51 +1,55 @@
-module Admin
-  class Plugins &lt; Base
-    before :find_plugin, :only =&gt; %w(update delete show)
+require File.join(File.dirname(__FILE__), &quot;base&quot;)
 
-    def index
-      @plugins = Plugin.all
-      display @plugins
-    end
+module Feather
+  module Admin
+    class Plugins &lt; Base
+      before :find_plugin, :only =&gt; %w(update delete show)
 
-    def show(id)
-      display @plugin
-    end
+      def index
+        @plugins = Feather::Plugin.all
+        display @plugins
+      end
 
-    def new
-      @plugin = Plugin.new
-      display @plugin
-    end
+      def show(id)
+        display @plugin
+      end
 
-    def create(plugin)
-      @plugin = Plugin.new
-      @plugin.url = plugin[:url]
-      if @plugin.save
-        # Check to see if the plugin has any views registered, if so we'll expire the cache
-        expire_all_pages if Hooks::View.has_views_registered?(@plugin)
-        redirect url(:admin_plugin, @plugin)
-      else
-        render :new
+      def new
+        @plugin = Feather::Plugin.new
+        display @plugin
       end
-    end
 
-    def update(id)
-      #merb-action-args doesn't appear to play nice with ajax calls, so we're using params for the plugin active flag
-      @plugin = Plugin[id]
-      @plugin.active = params[:active] == &quot;true&quot; if params[:active]
-      @plugin.save
-      # Check to see if the plugin has any views registered, if so we'll need to expire all pages to be safe
-      expire_all_pages if Hooks::View.has_views_registered?(@plugin)
-      render_js
-    end
+      def create(plugin)
+        @plugin = Feather::Plugin.new
+        @plugin.url = plugin[:url]
+        if @plugin.save
+          # Check to see if the plugin has any views registered, if so we'll expire the cache
+          # expire_all_pages if Feather::Hooks::View.has_views_registered?(@plugin)
+          redirect url(:admin_plugin, @plugin)
+        else
+          render :new
+        end
+      end
 
-    def delete(id)
-      @plugin.destroy
-      redirect url(:admin_plugins)
-    end
+      def update(id)
+        #merb-action-args doesn't appear to play nice with ajax calls, so we're using params for the plugin active flag
+        @plugin = Feather::Plugin[id]
+        @plugin.active = params[:active] == &quot;true&quot; if params[:active]
+        @plugin.save
+        # Check to see if the plugin has any views registered, if so we'll need to expire all pages to be safe
+        # expire_all_pages if Feather::Hooks::View.has_views_registered?(@plugin)
+        render_js
+      end
 
-    private
-      def find_plugin
-        @plugin = Plugin[params[:id]]
+      def delete(id)
+        @plugin.destroy
+        redirect url(:admin_plugins)
       end
+
+      private
+        def find_plugin
+          @plugin = Feather::Plugin[params[:id]]
+        end
+    end
   end
-end
+end
\ No newline at end of file</diff>
      <filename>app/controllers/admin/plugins.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,49 +1,51 @@
-class Application &lt; Merb::Controller
-  include Merb::AssetsMixin
-  # include CacheHelper
+module Feather
+  class Application &lt; Merb::Controller
+    include Merb::AssetsMixin
+    # include CacheHelper
 
-  before :get_settings
-  before :load_plugins
-  before :fire_before_event
-  # before :fix_cache_issue_with_merb_093
+    before :get_settings
+    before :load_plugins
+    before :fire_before_event
+    # before :fix_cache_issue_with_merb_093
 
-  ##
-  # This just makes sure that params[:format] isn't null, to get around the merb 0.9.3 cache issue
-  def fix_cache_issue_with_merb_093
-    params[:format] = [] if params[:format].nil?
-  end
+    ##
+    # This just makes sure that params[:format] isn't null, to get around the merb 0.9.3 cache issue
+    def fix_cache_issue_with_merb_093
+      params[:format] = [] if params[:format].nil?
+    end
 
-  ##
-  # This grabs settings
-  def get_settings
-    @settings = Configuration.current
-  end
+    ##
+    # This grabs settings
+    def get_settings
+      @settings = Feather::Configuration.current
+    end
 
-  ##
-  # This ensures all plugins are loaded before any requests are dealt with - if one of the other server processes in a cluster adds one, it needs to be picked up
-  def load_plugins
-    # Loop through all plugins by name
-    Plugin.all(:order =&gt; [:name]).each do |plugin|
-      # Load the plugin
-      plugin.load unless plugin.loaded?
+    ##
+    # This ensures all plugins are loaded before any requests are dealt with - if one of the other server processes in a cluster adds one, it needs to be picked up
+    def load_plugins
+      # Loop through all plugins by name
+      Feather::Plugin.all(:order =&gt; [:name]).each do |plugin|
+        # Load the plugin
+        plugin.load unless plugin.loaded?
+      end
     end
-  end
 
-  ##
-  # This fires the application before event for any subscribing plugins
-  def fire_before_event
-    Hooks::Events.application_before
-  end
+    ##
+    # This fires the application before event for any subscribing plugins
+    def fire_before_event
+      Feather::Hooks::Events.application_before
+    end
 
-  ##
-  # This puts notification text in the session, to be rendered in any view
-  def notify(text)
-    session[:notifications] = text
-  end
+    ##
+    # This puts notification text in the session, to be rendered in any view
+    def notify(text)
+      session[:notifications] = text
+    end
 
-  ##
-  # This allows a view to expand its template roots to include its own custom views
-  def self.include_plugin_views(plugin)
-    self._template_roots &lt;&lt; [File.join(Hooks::get_plugin_by_caller(plugin).path, &quot;views&quot;), :_template_location]
+    ##
+    # This allows a view to expand its template roots to include its own custom views
+    def self.include_plugin_views(plugin)
+      self._template_roots &lt;&lt; [File.join(Feather::Hooks::get_plugin_by_caller(plugin).path, &quot;views&quot;), :_template_location]
+    end
   end
-end
+end
\ No newline at end of file</diff>
      <filename>app/controllers/application.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,27 +1,29 @@
-class Articles &lt; Application
-   # cache_pages :index, :show
+module Feather
+  class Articles &lt; Application
+     # cache_pages :index, :show
 
-  # This handles the index (recent articles), or the year/month/day views
-  def index
-    @archives = Article.get_archive_hash
-    if params[:day]
-      @articles = Article.find_by_year_month_day(params[:year], params[:month], params[:day])
-    elsif params[:month]
-      @articles = Article.find_by_year_month(params[:year], params[:month])
-    elsif params[:year]
-      @articles = Article.find_by_year(params[:year])
-    else
-      @articles = Article.find_recent
+    # This handles the index (recent articles), or the year/month/day views
+    def index
+      @archives = Feather::Article.get_archive_hash
+      if params[:day]
+        @articles = Feather::Article.find_by_year_month_day(params[:year], params[:month], params[:day])
+      elsif params[:month]
+        @articles = Feather::Article.find_by_year_month(params[:year], params[:month])
+      elsif params[:year]
+        @articles = Feather::Article.find_by_year(params[:year])
+      else
+        @articles = Feather::Article.find_recent
+      end
+      # Can't use this with caching at the minute, meaning post-process events are tricky...
+      #render_then_call(display(@articles)) { Feather::Hooks::Events.after_index_article_request(@articles, request) }
+      display @articles
     end
-    # Can't use this with caching at the minute, meaning post-process events are tricky...
-    #render_then_call(display(@articles)) { Hooks::Events.after_index_article_request(@articles, request) }
-    display @articles
-  end
 
-  def show(id)
-    @article = Article[id]
-    # Can't use this with caching at the minute, meaning post-process events are tricky...
-    #render_then_call(display(@article)) { Hooks::Events.after_show_article_request(@article, request) }
-    display @article
+    def show(id)
+      @article = Feather::Article[id]
+      # Can't use this with caching at the minute, meaning post-process events are tricky...
+      #render_then_call(display(@article)) { Feather::Hooks::Events.after_show_article_request(@article, request) }
+      display @article
+    end
   end
-end
+end
\ No newline at end of file</diff>
      <filename>app/controllers/articles.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-class Exceptions &lt; Application
+class Exceptions &lt; Merb::Controller
   
   # handle NotFound exceptions (404)
   def not_found</diff>
      <filename>app/controllers/exceptions.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,8 @@
 module Merb
-  module Admin
-    module ConfigurationsHelper
+  module Feather
+    module Admin
+      module ConfigurationsHelper
+      end
     end
   end
 end</diff>
      <filename>app/helpers/admin/configurations_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,8 @@
 module Merb
-  module Admin
-    module DashboardHelper
+  module Feather
+    module Admin
+      module DashboardHelper
+      end
     end
   end
 end</diff>
      <filename>app/helpers/admin/dashboard_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,6 @@
 module Merb
-  module ArticlesHelper
+  module Feather
+    module ArticlesHelper
+    end
   end
 end</diff>
      <filename>app/helpers/articles_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -11,13 +11,13 @@ module Merb
     ##
     # This formats the specified text using the specified formatter, returning the result
     def render_text(formatter, text)
-      Hooks::Formatters.format_text(formatter, text)
+      ::Feather::Hooks::Formatters.format_text(formatter, text)
     end
 
     ##
     # This formats the specified article, using it's configured formatter, returning the result
     def render_article(article)
-      Hooks::Formatters.format_article(article)
+      ::Feather::Hooks::Formatters.format_article(article)
     end
 
     ##
@@ -90,13 +90,13 @@ module Merb
     ##
     # This returns the url for the month article index
     def month_url(year, month)
-      url(:month, {:year =&gt; year, :month =&gt; Padding::pad_single_digit(month)})
+      url(:month, {:year =&gt; year, :month =&gt; Feather::Padding::pad_single_digit(month)})
     end
 
     ##
     # This returns the url for the day article index
     def day_url(year, month, day)
-      url(:day, {:year =&gt; year, :month =&gt; Padding::pad_single_digit(month), :day =&gt; Padding::pad_single_digit(day)})
+      url(:day, {:year =&gt; year, :month =&gt; Feather::Padding::pad_single_digit(month), :day =&gt; Feather::Padding::pad_single_digit(day)})
     end
 
     ##
@@ -113,7 +113,7 @@ module Merb
       # else
       #  items &lt;&lt; {:text =&gt; &quot;Logout&quot;, :url =&gt; url(:logout)}
       # end
-      Hooks::Menu.menu_items.each { |item| items &lt;&lt; item }
+      ::Feather::Hooks::Menu.menu_items.each { |item| items &lt;&lt; item }
       items
     end
 
@@ -127,7 +127,7 @@ module Merb
     # This renders all plugin views for the specified hook
     def render_plugin_views(name, options = {})
       output = &quot;&quot;
-      Hooks::View.plugin_views.each do |view|
+      ::Feather::Hooks::View.plugin_views.each do |view|
         if view[:name] == name
           if view[:partial]
             # Set the template root, create the template method and call the partial
@@ -159,7 +159,7 @@ module Merb
     ##
     # This returns true if the specified plugin is active, false if it isn't or is unavailable
     def is_plugin_active(name)
-      plugin = Plugin.first(:name =&gt; name)
+      plugin = Feather::Plugin.first(:name =&gt; name)
       plugin &amp;&amp; plugin.active
     end
     </diff>
      <filename>app/helpers/global_helpers.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,15 +1,24 @@
-dependency &quot;merb-action-args&quot;, &quot;0.9.9&quot;   # Provides support for querystring arguments to be passed in to controller actions
-dependency &quot;merb-assets&quot;, &quot;0.9.9&quot;        # Provides link_to, asset_path, auto_link, image_tag methods (and lots more)
-dependency &quot;merb-cache&quot;, &quot;0.9.9&quot;         # Provides your application with caching functions 
-dependency &quot;merb-helpers&quot;, &quot;0.9.9&quot;       # Provides the form, date/time, and other helpers
-dependency &quot;merb-mailer&quot;, &quot;0.9.9&quot;        # Integrates mail support via Merb Mailer
-dependency &quot;merb-slices&quot;, &quot;0.9.9&quot;        # Provides a mechanism for letting plugins provide controllers, views, etc. to your app
-dependency &quot;merb-auth&quot;, &quot;0.9.9&quot;          # An authentication slice (Merb's equivalent to Rails' restful authentication)
-dependency &quot;merb-param-protection&quot;, &quot;0.9.9&quot;
+# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
+merb_gems_version = &quot;1.0&quot;
+dm_gems_version   = &quot;0.9.6&quot;
+
+# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
+dependency &quot;merb-action-args&quot;, merb_gems_version
+dependency &quot;merb-assets&quot;, merb_gems_version  
+dependency &quot;merb-cache&quot;, merb_gems_version   
+dependency &quot;merb-helpers&quot;, merb_gems_version 
+dependency &quot;merb-mailer&quot;, merb_gems_version  
+dependency &quot;merb-slices&quot;, merb_gems_version  
+dependency &quot;merb-auth-core&quot;, merb_gems_version
+dependency &quot;merb-auth-more&quot;, merb_gems_version
+dependency &quot;merb-auth-slice-password&quot;, merb_gems_version
+dependency &quot;merb-param-protection&quot;, merb_gems_version
+dependency &quot;merb-exceptions&quot;, merb_gems_version
  
-dependency &quot;dm-core&quot;, &quot;0.9.6&quot;         # The datamapper ORM
-dependency &quot;dm-aggregates&quot;, &quot;0.9.6&quot;   # Provides your DM models with count, sum, avg, min, max, etc.
-dependency &quot;dm-migrations&quot;, &quot;0.9.6&quot;   # Make incremental changes to your database.
-dependency &quot;dm-timestamps&quot;, &quot;0.9.6&quot;   # Automatically populate created_at, created_on, etc. when those properties are present.
-dependency &quot;dm-types&quot;, &quot;0.9.6&quot;        # Provides additional types, including csv, json, yaml.
-dependency &quot;dm-validations&quot;, &quot;0.9.6&quot;  # Validation framework
+dependency &quot;dm-core&quot;, dm_gems_version         
+dependency &quot;dm-aggregates&quot;, dm_gems_version   
+dependency &quot;dm-migrations&quot;, dm_gems_version   
+dependency &quot;dm-timestamps&quot;, dm_gems_version   
+dependency &quot;dm-types&quot;, dm_gems_version        
+dependency &quot;dm-validations&quot;, dm_gems_version  
+dependency &quot;dm-is-paginated&quot;, &quot;0.0.1&quot; # DM pagination
\ No newline at end of file</diff>
      <filename>config/dependencies.rb</filename>
    </modified>
    <modified>
      <diff>@@ -16,5 +16,4 @@
 - dm-aggregates (&gt;= 0, runtime)
 - dm-validations (&gt;= 0, runtime)
 - dm-timestamps (&gt;= 0, runtime)
-- merb_paginate (&gt;= 0, runtime)
 - dm-core (&gt;= 0, runtime)</diff>
      <filename>config/dependencies.yml</filename>
    </modified>
    <modified>
      <diff>@@ -46,24 +46,24 @@ use_test :test_unit
 
 ### Add your other dependencies here
 
+require 'config/dependencies.rb'
+
 # These are some examples of how you might specify dependencies.
 # 
 gem &quot;archive-tar-minitar&quot;
-dependency &quot;merb-helpers&quot;
-dependency &quot;merb-assets&quot;
-# dependency &quot;merb-cache&quot;
-dependency &quot;merb-action-args&quot;
-dependency &quot;merb_has_flash&quot;
-dependency &quot;merb-mailer&quot;
-dependency &quot;merb-slices&quot;
-dependency &quot;merb-auth&quot;
-dependency &quot;merb-auth-slice-password&quot;
-dependency &quot;merb-auth-core&quot;
-dependency &quot;merb-auth-more&quot;
-dependency &quot;dm-aggregates&quot;
-dependency &quot;dm-validations&quot;
-dependency &quot;dm-timestamps&quot;
-dependency &quot;merb_paginate&quot;
+#dependency &quot;merb-helpers&quot;
+#dependency &quot;merb-assets&quot;
+#dependency &quot;merb-action-args&quot;
+#dependency &quot;merb_has_flash&quot;
+#dependency &quot;merb-mailer&quot;
+#dependency &quot;merb-slices&quot;
+#dependency &quot;merb-auth&quot;
+#dependency &quot;merb-auth-slice-password&quot;
+#dependency &quot;merb-auth-core&quot;
+#dependency &quot;merb-auth-more&quot;
+#dependency &quot;dm-aggregates&quot;
+#dependency &quot;dm-validations&quot;
+#dependency &quot;dm-timestamps&quot;
 
 # OR
 # OR
@@ -77,6 +77,7 @@ Merb::BootLoader.before_app_loads do
 end
 
 Merb::BootLoader.after_app_loads do
+  Merb::Authentication.user_class = Feather::User
   require &quot;tzinfo&quot;
   require &quot;net/http&quot;
   require &quot;uri&quot;
@@ -85,14 +86,15 @@ Merb::BootLoader.after_app_loads do
   require &quot;zlib&quot;
   require &quot;stringio&quot;
   require &quot;archive/tar/minitar&quot;
-  require File.join(&quot;lib&quot;, &quot;padding&quot;)
-  require File.join(&quot;lib&quot;, &quot;hooks&quot;)
-  require File.join(&quot;lib&quot;, &quot;database&quot;)
-  require File.join(&quot;lib&quot;, &quot;plugin_dependencies&quot;)
+  require File.join(&quot;lib&quot;, &quot;feather&quot;, &quot;padding&quot;)
+  require File.join(&quot;lib&quot;, &quot;feather&quot;, &quot;hooks&quot;)
+  require File.join(&quot;lib&quot;, &quot;feather&quot;, &quot;database&quot;)
+  require File.join(&quot;lib&quot;, &quot;feather&quot;, &quot;plugin_dependencies&quot;)
+  require File.join(&quot;lib&quot;, &quot;merb_auth_setup&quot;)
 
   # This loads the plugins
   begin
-    Plugin.all(:order =&gt; [:name]).each do |p|
+    Feather::Plugin.all(:order =&gt; [:name]).each do |p|
       begin
         p.load
         Merb.logger.info(&quot;\&quot;#{p.name}\&quot; loaded&quot;)
@@ -106,7 +108,7 @@ Merb::BootLoader.after_app_loads do
 
 #  raise &quot;You must specify a valid openid in Merb.root/config/openid to use this example app&quot; unless File.exists?(Merb.root / &quot;config&quot; / &quot;open_id&quot;)
   DataMapper.auto_migrate! { 
-  User.create(:login =&gt; &quot;admin&quot;, 
+  Feather::User.create(:login =&gt; &quot;admin&quot;, 
               :name =&gt; &quot;admin&quot;,
               :email =&gt; &quot;admin@example.com&quot;, 
               :password =&gt; &quot;password&quot;, :password_confirmation =&gt; &quot;password&quot;, </diff>
      <filename>config/init.rb</filename>
    </modified>
    <modified>
      <diff>@@ -24,28 +24,27 @@ Merb::Router.prepare do
   slice(:merb_auth_slice_password, :name_prefix =&gt; nil, :path_prefix =&gt; &quot;&quot;)
   # This deferred route allows permalinks to be handled, without a separate rack handler
   match(/.*/).defer_to do |request, params|
-    unless (article = Article.find_by_permalink(request.uri.to_s.chomp(&quot;/&quot;))).nil?
-      {:controller =&gt; &quot;articles&quot;, :action =&gt; &quot;show&quot;, :id =&gt; article.id}
+    unless (article = Feather::Article.find_by_permalink(request.uri.to_s.chomp(&quot;/&quot;))).nil?
+      {:controller =&gt; &quot;feather/articles&quot;, :action =&gt; &quot;show&quot;, :id =&gt; article.id}
     end
   end
   
   # Admin namespace
-  namespace :admin do
+  namespace &quot;feather/admin&quot;, :path =&gt; &quot;admin&quot;, :name_prefix =&gt; &quot;admin&quot; do
     resource :configuration
-    resources :categories
     resources :plugins
     resources :articles
     resource :dashboard
   end
-  match(&quot;/admin&quot;).to(:action =&gt; &quot;show&quot;, :controller =&gt; &quot;admin/dashboards&quot;)
+  match(&quot;/admin&quot;).to(:action =&gt; &quot;show&quot;, :controller =&gt; &quot;feather/admin/dashboards&quot;)
 
   # Year/month/day routes
-  match(&quot;/:year&quot;).to(:controller =&gt; &quot;articles&quot;, :action =&gt; &quot;index&quot;).name(:year)
-  match(&quot;/:year/:month&quot;).to(:controller =&gt; &quot;articles&quot;, :action =&gt; &quot;index&quot;).name(:month)
-  match(&quot;/:year/:month/:day&quot;).to(:controller =&gt; &quot;articles&quot;, :action =&gt; &quot;index&quot;).name(:day)
+  match(&quot;/:year&quot;).to(:controller =&gt; &quot;feather/articles&quot;, :action =&gt; &quot;index&quot;).name(:year)
+  match(&quot;/:year/:month&quot;).to(:controller =&gt; &quot;feather/articles&quot;, :action =&gt; &quot;index&quot;).name(:month)
+  match(&quot;/:year/:month/:day&quot;).to(:controller =&gt; &quot;feather/articles&quot;, :action =&gt; &quot;index&quot;).name(:day)
   
   # Default routes, and index
   default_routes  
-  match(&quot;/&quot;).to(:controller =&gt; 'articles', :action =&gt;'index')
+  match(&quot;/&quot;).to(:controller =&gt; 'feather/articles', :action =&gt;'index')
 end
 </diff>
      <filename>config/router.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,12 +1,14 @@
-class Authentication
+module Merb
+  class Authentication
+
+    def store_user(user)
+      return nil unless user
+      user.id
+    end
   
-  def store_user(user)
-    return nil unless user
-    user.id
-  end
-  
-  def fetch_user(session_info)
-    User.get(session_info)
-  end
+    def fetch_user(session_info)
+      ::Feather::User.get(session_info)
+    end
     
-end # Authentication
\ No newline at end of file
+  end # Authentication
+end
\ No newline at end of file</diff>
      <filename>lib/merb_auth_setup.rb</filename>
    </modified>
    <modified>
      <diff>@@ -110,13 +110,13 @@ var FormHelper = {
 
 Event.observe(window, 'load', function() {
 	//Set up the events for the configuration page
-	FormHelper.inPlaceEditEvents(&quot;configuration-title&quot;, &quot;/admin/configurations?title=&quot;);
-	FormHelper.inPlaceEditEvents(&quot;configuration-tag-line&quot;, &quot;/admin/configurations?tag_line=&quot;);
-	FormHelper.inPlaceEditEvents(&quot;configuration-permalink-format&quot;, &quot;/admin/configurations?permalink_format=&quot;);
-	FormHelper.inPlaceEditEvents(&quot;configuration-about&quot;, &quot;/admin/configurations?about=&quot;, true);
-	FormHelper.inPlaceDropDownEvents(&quot;configuration-about-formatter&quot;, &quot;/admin/configurations?about_formatter=&quot;);
+	FormHelper.inPlaceEditEvents(&quot;configuration-title&quot;, &quot;/admin/configuration?title=&quot;);
+	FormHelper.inPlaceEditEvents(&quot;configuration-tag-line&quot;, &quot;/admin/configuration?tag_line=&quot;);
+	FormHelper.inPlaceEditEvents(&quot;configuration-permalink-format&quot;, &quot;/admin/configuration?permalink_format=&quot;);
+	FormHelper.inPlaceEditEvents(&quot;configuration-about&quot;, &quot;/admin/configuration?about=&quot;, true);
+	FormHelper.inPlaceDropDownEvents(&quot;configuration-about-formatter&quot;, &quot;/admin/configuration?about_formatter=&quot;);
 	Event.observe(&quot;configuration-clear-cache&quot;, &quot;click&quot;, function() {
-		new Ajax.Request(&quot;/admin/configurations&quot;, {
+		new Ajax.Request(&quot;/admin/configuration&quot;, {
 			asynchronous:'true',
 			evalScripts:'true',
 			method:'put',</diff>
      <filename>public/javascripts/admin.js</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>app/models/activity.rb</filename>
    </removed>
    <removed>
      <filename>app/models/article.rb</filename>
    </removed>
    <removed>
      <filename>app/models/configuration.rb</filename>
    </removed>
    <removed>
      <filename>app/models/plugin.rb</filename>
    </removed>
    <removed>
      <filename>app/models/plugin_setting.rb</filename>
    </removed>
    <removed>
      <filename>app/models/user.rb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/articles/_article.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/articles/_form.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/articles/edit.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/articles/index.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/articles/new.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/articles/show.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/configurations/show.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/configurations/update.js.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/dashboards/show.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/plugins/_plugin.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/plugins/index.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/plugins/new.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/plugins/show.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/admin/plugins/update.js.erb</filename>
    </removed>
    <removed>
      <filename>app/views/articles/_article.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/articles/index.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/articles/show.html.erb</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Collection.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Collection.src/M000028.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Collection.src/M000029.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Collection.src/M000030.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Collection.src/M000031.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Collection.src/M000032.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Collection.src/M000033.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Collection.src/M000034.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Collection.src/M000035.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Finder.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Finder.src/M000012.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Finder/ClassMethods.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Finder/ClassMethods.src/M000013.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Finder/ClassMethods.src/M000014.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Finder/ClassMethods.src/M000015.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/Finder/ClassMethods.src/M000016.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/InvalidPage.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/InvalidPage.src/M000027.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/LinkRenderer.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/LinkRenderer.src/M000019.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/LinkRenderer.src/M000020.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/LinkRenderer.src/M000021.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/LinkRenderer.src/M000022.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/LinkRenderer.src/M000023.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/LinkRenderer.src/M000024.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/LinkRenderer.src/M000025.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/LinkRenderer.src/M000026.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/NamedScope.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/NamedScope.src/M000017.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/NamedScope/ClassMethods.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/NamedScope/ClassMethods.src/M000018.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/ViewHelpers.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/ViewHelpers.src/M000009.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/ViewHelpers.src/M000010.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/classes/WillPaginate/ViewHelpers.src/M000011.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/created.rid</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/array_rb.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/array_rb.src/M000001.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/collection_rb.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/core_ext_rb.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/core_ext_rb.src/M000002.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/core_ext_rb.src/M000003.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/core_ext_rb.src/M000004.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/core_ext_rb.src/M000005.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/finder_rb.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/named_scope_patch_rb.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/named_scope_patch_rb.src/M000006.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/named_scope_patch_rb.src/M000007.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/named_scope_patch_rb.src/M000008.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/named_scope_rb.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/version_rb.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate/view_helpers_rb.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/files/lib/will_paginate_rb.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/fr_class_index.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/fr_file_index.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/fr_method_index.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/index.html</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/rdoc/rdoc-style.css</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Collection/cdesc-Collection.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Collection/create-c.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Collection/new-c.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Collection/next_page-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Collection/offset-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Collection/out_of_bounds%3f-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Collection/previous_page-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Collection/replace-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Collection/total_entries%3d-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Deprecation/cdesc-Deprecation.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Finder/ClassMethods/cdesc-ClassMethods.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Finder/ClassMethods/paginate-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Finder/ClassMethods/paginate_by_sql-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Finder/ClassMethods/paginated_each-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Finder/ClassMethods/wp_count-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Finder/cdesc-Finder.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/Finder/included-c.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/InvalidPage/cdesc-InvalidPage.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/InvalidPage/new-c.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/LinkRenderer/cdesc-LinkRenderer.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/LinkRenderer/gap_marker-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/LinkRenderer/html_attributes-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/LinkRenderer/new-c.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/LinkRenderer/page_link_or_span-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/LinkRenderer/to_html-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/LinkRenderer/url_for-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/LinkRenderer/visible_page_numbers-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/LinkRenderer/windowed_links-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/NamedScope/ClassMethods/cdesc-ClassMethods.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/NamedScope/ClassMethods/named_scope-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/NamedScope/Scope/cdesc-Scope.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/NamedScope/cdesc-NamedScope.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/NamedScope/included-c.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/VERSION/cdesc-VERSION.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/ViewHelpers/cdesc-ViewHelpers.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/ViewHelpers/page_entries_info-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/ViewHelpers/paginated_section-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/ViewHelpers/will_paginate-i.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/WillPaginate/cdesc-WillPaginate.yaml</filename>
    </removed>
    <removed>
      <filename>gems/doc/will_paginate-2.2.2/ri/created.rid</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/LICENSE</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/README</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/Rakefile</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/TODO</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/activerecord_generators/ma_migration/ma_migration_generator.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/activerecord_generators/ma_migration/templates/schema/migrations/%time_stamp%_add_ma_user.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/app/controllers/application.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/app/controllers/sessions.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/app/controllers/users.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/app/helpers/application_helper.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/app/mailers/user_mailer.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/app/mailers/views/user_mailer/activation.text.erb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/app/mailers/views/user_mailer/forgot_password.text.erb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/app/mailers/views/user_mailer/signup.text.erb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/app/views/layout/merb_auth.html.erb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/app/views/sessions/new.html.erb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/app/views/users/new.html.erb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/datamapper_generators/ma_migration/ma_migration_generator.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/datamapper_generators/ma_migration/templates/schema/migrations/add_ma_user.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/adapters/activerecord/init.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/adapters/activerecord/map.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/adapters/activerecord/model.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/adapters/common.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/adapters/datamapper/init.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/adapters/datamapper/map.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/adapters/datamapper/model.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/adapters/map.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/controller/controller.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/controller/sessions_base.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/controller/users_base.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/initializer.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/merbtasks.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/lib/merb-auth/slicetasks.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/plugins/forgotten_password/app/controllers/passwords.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/plugins/forgotten_password/app/models/user.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/plugins/forgotten_password/app/views/passwords/edit.html.erb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/plugins/forgotten_password/app/views/passwords/new.html.erb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/plugins/forgotten_password/forgotten_password.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/plugins/forgotten_password/init.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/plugins/forgotten_password/spec/controller_spec.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/plugins/forgotten_password/spec/model_spec.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/plugins/forgotten_password/spec/spec_helper.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/public/javascripts/master.js</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/public/stylesheets/master.css</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/spec/controllers/plugins/test_plugin.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/spec/controllers/sessions_spec.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/spec/controllers/users_spec.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/spec/mailers/user_mailer_spec.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/spec/merb_auth_spec.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/spec/models/ar_model_spec.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/spec/models/common_spec.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/spec/models/model_spec.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/spec/shared_specs/shared_model_spec.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/spec/spec_helper.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/spec/spec_helpers/helpers.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/spec/spec_helpers/valid_model_hashes.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/stubs/app/controllers/application.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/stubs/app/controllers/main.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/stubs/app/mailers/views/activation.text.erb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/stubs/app/mailers/views/signup.text.erb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/stubs/app/views/sessions/new.html.erb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb-auth-0.1.0/stubs/app/views/users/new.html.erb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb_paginate-0.0.4/LICENSE</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb_paginate-0.0.4/README</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb_paginate-0.0.4/Rakefile</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb_paginate-0.0.4/TODO</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb_paginate-0.0.4/lib/merb_paginate.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb_paginate-0.0.4/lib/merb_paginate/core_ext.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb_paginate-0.0.4/lib/merb_paginate/finders.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb_paginate-0.0.4/lib/merb_paginate/finders/activerecord.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb_paginate-0.0.4/lib/merb_paginate/finders/datamapper.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb_paginate-0.0.4/lib/merb_paginate/finders/generic.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb_paginate-0.0.4/lib/merb_paginate/finders/sequel.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/merb_paginate-0.0.4/lib/merb_paginate/view_helpers.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/CHANGELOG</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/LICENSE</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/README.rdoc</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/Rakefile</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/examples/apple-circle.gif</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/examples/index.haml</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/examples/index.html</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/examples/pagination.css</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/examples/pagination.sass</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/init.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/lib/will_paginate.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/lib/will_paginate/array.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/lib/will_paginate/collection.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/lib/will_paginate/core_ext.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/lib/will_paginate/finder.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/lib/will_paginate/named_scope.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/lib/will_paginate/named_scope_patch.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/lib/will_paginate/version.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/lib/will_paginate/view_helpers.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/boot.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/collection_test.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/console</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/database.yml</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/finder_test.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/fixtures/admin.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/fixtures/developer.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/fixtures/developers_projects.yml</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/fixtures/project.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/fixtures/projects.yml</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/fixtures/replies.yml</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/fixtures/reply.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/fixtures/schema.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/fixtures/topic.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/fixtures/topics.yml</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/fixtures/user.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/fixtures/users.yml</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/helper.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/lib/activerecord_test_case.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/lib/activerecord_test_connector.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/lib/load_fixtures.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/lib/view_test_process.rb</filename>
    </removed>
    <removed>
      <filename>gems/gems/will_paginate-2.2.2/test/view_test.rb</filename>
    </removed>
    <removed>
      <filename>gems/specifications/merb_paginate-0.0.4.gemspec</filename>
    </removed>
    <removed>
      <filename>gems/specifications/will_paginate-2.2.2.gemspec</filename>
    </removed>
    <removed>
      <filename>lib/cache_helper.rb</filename>
    </removed>
    <removed>
      <filename>lib/database.rb</filename>
    </removed>
    <removed>
      <filename>lib/hooks.rb</filename>
    </removed>
    <removed>
      <filename>lib/hooks/events.rb</filename>
    </removed>
    <removed>
      <filename>lib/hooks/formatters.rb</filename>
    </removed>
    <removed>
      <filename>lib/hooks/menu.rb</filename>
    </removed>
    <removed>
      <filename>lib/hooks/view.rb</filename>
    </removed>
    <removed>
      <filename>lib/padding.rb</filename>
    </removed>
    <removed>
      <filename>lib/plugin_dependencies.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>52b4784e47183f9b666c38139eb7237a3857622b</id>
    </parent>
  </parents>
  <author>
    <name>El Draper</name>
    <email>el@eldiablo.co.uk</email>
  </author>
  <url>http://github.com/mleung/feather/commit/d05ec7682fce7663e79fec6537ebcab25ebf2d5f</url>
  <id>d05ec7682fce7663e79fec6537ebcab25ebf2d5f</id>
  <committed-date>2008-11-15T16:37:29-08:00</committed-date>
  <authored-date>2008-11-15T16:37:29-08:00</authored-date>
  <message>making changes so that Feather can be used as a slice, it seems as though Feather core works standalone this way now - next up, the slice itself</message>
  <tree>4fc2b9d78ab2719e4cfbcfd2ec747dcae26b390a</tree>
  <committer>
    <name>El Draper</name>
    <email>el@eldiablo.co.uk</email>
  </committer>
</commit>
