Merge branch '0.2.x'

brianmario · Nov 9, 2011 · 0146e58 · 0146e58
2 parents d3a96b8 + 8b5b6bc
commit 0146e58
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.rvmrc b/.rvmrc
@@ -1 +1 @@
-rvm use 1.9.2@mysql2 --create
+rvm use 1.9.3@mysql2 --create
diff --git a/mysql2.gemspec b/mysql2.gemspec
@@ -27,4 +27,3 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sequel'
   s.add_development_dependency 'faker'
 end
-
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		rvm use 1.9.2@mysql2 --create
		rvm use 1.9.3@mysql2 --create
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,4 +27,3 @@ Gem::Specification.new do \|s\|
		s.add_development_dependency 'sequel'
		s.add_development_dependency 'faker'
		end