<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,9 +1,9 @@
 module ApplicationHelper
-  
+
   def html_attrs(lang = 'en-US')
     {:xmlns =&gt; &quot;http://www.w3.org/1999/xhtml&quot;, 'xml:lang' =&gt; lang, :lang =&gt; lang}
   end
-  
+
   def http_equiv_attrs
     {'http-equiv' =&gt; 'Content-Type', :content =&gt; 'text/html;charset=UTF-8'}
   end
@@ -15,16 +15,16 @@ module ApplicationHelper
     @page_title = str
     content_tag(container, str) if container
   end
-  
+
   # Outputs the corresponding flash message if any are set
   def flash_messages
     messages = []
     %w(notice warning error).each do |msg|
-      messages &lt;&lt; content_tag(:div, flash[msg.to_sym], :id =&gt; &quot;flash-#{msg}&quot;) unless flash[msg.to_sym].blank?
+      messages &lt;&lt; content_tag(:div, html_escape(flash[msg.to_sym]), :id =&gt; &quot;flash-#{msg}&quot;) unless flash[msg.to_sym].blank?
     end
     messages
   end
-  
+
   def blackbird_tags
     if SiteConfig.blackbird || true == session[:blackbird]
       '&lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;/blackbird/blackbird.js&quot;&gt;&lt;/script&gt;
@@ -33,7 +33,7 @@ module ApplicationHelper
       no_blackbird
     end rescue no_blackbird
   end
-  
+
   def no_blackbird
     '&lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot;&gt;var log = {toggle: function() {}, move: function() {}, resize: function() {}, clear: function() {}, debug: function() {}, info: function() {}, warn: function() {}, error: function() {}, profile: function() {} };&lt;/script&gt;'
   end</diff>
      <filename>app/helpers/application_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,5 @@
 # specify an alternate gems repository
-# source: http://local_mirror.example.com 
+# source: http://local_mirror.example.com
 # specify a different gem command
 # gem_command: 'jruby -S gem'
 gems:
@@ -9,9 +9,9 @@ gems:
   #   # use a specfic source URL
   #   source: 'http://mongrel.rubyforge.org/releases'
   #   # load with GemTools.load_gems
-  #   load: true 
+  #   load: true
   #   # any extra config that needs to be passed to gem install
-  #   config: '--with-pgsql-include-dir=/usr/local/pgsql/include --with-pgsql-lib-dir=/usr/local/pgsql/lib' 
+  #   config: '--with-pgsql-include-dir=/usr/local/pgsql/include --with-pgsql-lib-dir=/usr/local/pgsql/lib'
   #   # require name is different than the gem name
   #   require_name: foo-bar
 
@@ -20,18 +20,29 @@ gems:
     load: true
 
   - name: 'rspec-rails'
-    version: '1.1.8'
+    version: '1.1.11'
 
   # the version of rcov that doesn't segfualt all the time
   - name: 'mergulhao-rcov'
     versoin: '0.8.1.3.0'
+    source: 'http://gems.github.com'
 
   - name: 'capistrano'
     version: '2.5.0'
 
   - name: 'capistrano-ext'
     version: '1.2.1'
-    
+
   - name: 'RedCloth'
     version: '4.0.4'
     load: true
+
+  - name: 'mislav-will_paginate'
+    version: '2.3.6'
+    load: true
+    source: 'http://gems.github.com'
+
+  - name: 'rubyist-aasm'
+    version: '2.0.2'
+    laod: true
+    source: 'http://gems.github.com'</diff>
      <filename>config/gems.yml</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>vendor/plugins/aasm/.gitignore</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/CHANGELOG</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/MIT-LICENSE</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/README.rdoc</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/Rakefile</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/TODO</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/aasm.gemspec</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/aasm.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/doc/jamis.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/lib/aasm.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/lib/event.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/lib/persistence.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/lib/persistence/active_record_persistence.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/lib/state.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/lib/state_machine.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/lib/state_transition.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/lib/version.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/spec/functional/conversation.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/spec/functional/conversation_spec.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/spec/spec_helper.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/spec/unit/aasm_spec.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/spec/unit/active_record_persistence_spec.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/spec/unit/event_spec.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/spec/unit/state_spec.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/aasm/spec/unit/state_transition_spec.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/.gitignore</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/.manifest</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/CHANGELOG</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/LICENSE</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/README.rdoc</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/Rakefile</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/examples/apple-circle.gif</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/examples/index.haml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/examples/index.html</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/examples/pagination.css</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/examples/pagination.sass</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/init.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/lib/will_paginate.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/lib/will_paginate/array.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/lib/will_paginate/collection.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/lib/will_paginate/finder.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/lib/will_paginate/named_scope.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/lib/will_paginate/named_scope_patch.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/lib/will_paginate/version.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/boot.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/collection_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/console</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/database.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/finder_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/fixtures/admin.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/fixtures/developer.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/fixtures/developers_projects.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/fixtures/project.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/fixtures/projects.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/fixtures/replies.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/fixtures/reply.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/fixtures/schema.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/fixtures/topic.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/fixtures/topics.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/fixtures/user.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/fixtures/users.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/helper.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/lib/load_fixtures.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/lib/view_test_process.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/tasks.rake</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/test/view_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/will_paginate/will_paginate.gemspec</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>47858b27f31f5ef81f6251ba440b1d13706854b3</id>
    </parent>
  </parents>
  <author>
    <name>Michael Moen</name>
    <email>michael@underpantsgnome.com</email>
  </author>
  <url>http://github.com/UnderpantsGnome/bort/commit/611558d71e4edc3a129f972155eec5d75cdb3d39</url>
  <id>611558d71e4edc3a129f972155eec5d75cdb3d39</id>
  <committed-date>2008-11-09T11:41:52-08:00</committed-date>
  <authored-date>2008-11-09T11:41:52-08:00</authored-date>
  <message>switch to the gems for will_paginate and aasm</message>
  <tree>d730a756ad466a8a3e886b6e3be88e90e9db8fe7</tree>
  <committer>
    <name>Michael Moen</name>
    <email>michael@underpantsgnome.com</email>
  </committer>
</commit>
