<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -5,24 +5,24 @@ module MerbAuth
       display @users
     end
 
-    def show
-      @user = User.get(params[:id])
+    def show(id)
+      @user = User.get(id)
       display @user
     end
 
-    def edit
-      @user = User.get(params[:id])
+    def edit(id)
+      @user = User.get(id)
       display @user      
     end
 
-    def delete
-      @user = User.get(params[:id]).destroy
+    def delete(id)
+      @user = User.get(id).destroy
       redirect url(:users)
     end
 
-    def update
-      @user = User.get(params[:id])
-      if @user.update_attributes(params[:user])
+    def update(id, user)
+      @user = User.get(id)
+      if @user.update_attributes(user)
         redirect_back_or_default(url(:users))
       else
         render :edit</diff>
      <filename>slices/merb-auth/app/controllers/users.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>e1e4f029508989cafafffc0de49ace3169ff043a</id>
    </parent>
  </parents>
  <author>
    <name>AJ Christensen</name>
    <email>aj@junglist.gen.nz</email>
  </author>
  <url>http://github.com/mleung/feather/commit/160aa83ee44d0055f6464c769601d35a59cfe472</url>
  <id>160aa83ee44d0055f6464c769601d35a59cfe472</id>
  <committed-date>2008-07-21T03:49:46-07:00</committed-date>
  <authored-date>2008-07-21T03:49:46-07:00</authored-date>
  <message>Merb-action-arged the MA users controller.. Makin' it perrrty</message>
  <tree>6d23f284b153e322df9e445e31b1fc615d30ac66</tree>
  <committer>
    <name>AJ Christensen</name>
    <email>aj@junglist.gen.nz</email>
  </committer>
</commit>
