From 5b12ba4d144a06f393699c317f3f9b124fd12d05 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Sun, 27 Mar 2011 08:47:50 -0700
Subject: [PATCH] Update devise dependency to version 1.2.0

---
 Gemfile.lock | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2f57af1..154bc59 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,9 +31,10 @@ GEM
     arel (2.0.9)
     bcrypt-ruby (2.1.4)
     builder (2.1.2)
-    devise (1.1.8)
+    devise (1.2.0)
       bcrypt-ruby (~> 2.1.2)
-      warden (~> 1.0.2)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.0.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     geokit (1.5.0)
@@ -44,6 +45,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    orm_adapter (0.0.4)
     pg (0.10.1)
     polyglot (0.3.1)
     rack (1.2.2)