From 27e8e82f06e9f81f869549ddc55e8c10b18cb335 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Nov 03 2012 17:55:13 +0000
Subject: Merge remote-tracking branch 'origin/master' into f18


---

diff --git a/.gitignore b/.gitignore
index 2597598..e28bcfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ flexmock-0.8.7.gem
 /flexmock-0.9.0.gem
 /flexmock-1.0.2.gem
 /flexmock-1.0.3.gem
+/flexmock-1.1.0.gem
diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec
index 3aba8d4..ac7a410 100644
--- a/rubygem-flexmock.spec
+++ b/rubygem-flexmock.spec
@@ -9,7 +9,7 @@
 
 Summary:	Mock object library for ruby
 Name:		rubygem-%{gem_name}
-Version:	1.0.3
+Version:	1.1.0
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	Copyright only
@@ -159,6 +159,9 @@ rake test_all --trace
 %endif
 
 %changelog
+* Sun Nov  4 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.1.0-1
+- 1.1.0
+
 * Thu Oct 11 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.0.3-1
 - 1.0.3
 
diff --git a/sources b/sources
index 26291f2..e1802df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2454df79dadd065bb207a6840fb1a549  flexmock-1.0.3.gem
+d9096ebf9dc84de3ed0aed721cc728e2  flexmock-1.1.0.gem