From 2a0917817c006aaad3be2fa6b5067eb6a506deb3 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 13 Feb 2012 08:43:50 +0000
Subject: [PATCH 1/1] equire composite_primary_keys 5.0.0

---
 Gemfile      |  2 +-
 Gemfile.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 798c5afd4..a89169cfa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'oauth-plugin', '>= 0.4.0.pre7'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
-gem 'composite_primary_keys', '>= 5.0.0.rc1'
+gem 'composite_primary_keys', '>= 5.0.0'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index eefb8a788..1bbc63f46 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,8 +40,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    composite_primary_keys (5.0.0.rc1)
-      activerecord (~> 3.2.0.rc2)
+    composite_primary_keys (5.0.0)
+      activerecord (~> 3.2.0)
     deadlock_retry (1.1.2)
     dynamic_form (1.1.4)
     erubis (2.7.0)
@@ -68,10 +68,10 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcache-client (1.8.5)
-    memcached (1.3.6)
+    memcached (1.3.7)
     mime-types (1.17.2)
     multi_json (1.0.4)
-    multipart-post (1.1.4)
+    multipart-post (1.1.5)
     nokogiri (1.5.0)
     oauth (0.4.5)
     oauth-plugin (0.4.0.rc2)
@@ -84,12 +84,12 @@ GEM
       multi_json (~> 1.0)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
-    paperclip (2.5.2)
+    paperclip (2.6.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
-    pg (0.12.2)
+    pg (0.13.1)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.1)
@@ -128,7 +128,7 @@ GEM
     ruby-openid (2.1.8)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.1.12)
+    sass (3.1.15)
     sass-rails (3.2.4)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -157,7 +157,7 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   coffee-rails (~> 3.2.1)
-  composite_primary_keys (>= 5.0.0.rc1)
+  composite_primary_keys (>= 5.0.0)
   deadlock_retry (>= 1.1.2)
   dynamic_form
   http_accept_language (>= 1.0.2)
-- 
2.43.2