From 132161da6911b51f6c5807d696f59d16d1ce1d23 Mon Sep 17 00:00:00 2001
From: tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 9 Jun 2011 17:26:29 +0000
Subject: [PATCH] * ext/psych/lib/psych.rb: updating version to match released
 gem.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31977 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              | 4 ++++
 ext/psych/lib/psych.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index adfa289951..51f9ad6c8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 10 02:25:53 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: updating version to match released gem.
+
 Fri Jun 10 01:06:29 2011  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* ext/bigdecimal (BigDecimal_to_i): Integer#** may return flonum.
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index e399dcca55..31d73c1f03 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -90,7 +90,7 @@ require 'psych/json'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '1.1.1'
+  VERSION         = '1.2.0'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'