<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -16,12 +16,12 @@ class Merb::Authentication
       class Form &lt; Base
         
         def run!
-          if login = request.params[login_param] &amp;&amp; password = request.params[password_param]
+          if (login = request.params[login_param]) &amp;&amp; (password = request.params[password_param])
             user = user_class.authenticate(login, password)
             if !user
               errors = request.session.authentication.errors
               errors.clear!
-              error.add(login_param, strategy_error_message)
+              errors.add(login_param, strategy_error_message)
             end
             user
           end</diff>
      <filename>merb-auth/merb-auth-more/lib/merb-auth-more/strategies/basic/password_form.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
 module Merb
-  VERSION = '1.0.6.1' unless defined?(Merb::VERSION)
+  VERSION = '1.0.7' unless defined?(Merb::VERSION)
   DM_VERSION = '0.9.8' unless defined?(Merb::DM_VERSION)
 end</diff>
      <filename>merb-core/lib/merb-core/version.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>bd456640ba1a970e6796781d2bd25a302695e2aa</id>
    </parent>
  </parents>
  <author>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </author>
  <url>http://github.com/wycats/merb/commit/30d90d39595d291496e674f2bd79d7777467fa73</url>
  <id>30d90d39595d291496e674f2bd79d7777467fa73</id>
  <committed-date>2008-12-28T16:30:03-08:00</committed-date>
  <authored-date>2008-12-28T16:30:03-08:00</authored-date>
  <message>Fixes bug in merb-auth caught by step-by-step tester</message>
  <tree>5891c5cd2206483e5d5b63100549bfd11fabd179</tree>
  <committer>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </committer>
</commit>
