From 87a7f080fda64e087e3aae9828274ec28cdce72b Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Sun, 20 Mar 2011 14:48:56 -0700
Subject: [PATCH] Prepare for version 1.2.0 release

---
 HISTORY.mkd            | 13 ++++++++++++-
 lib/twitter/version.rb |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/HISTORY.mkd b/HISTORY.mkd
index d4f6bb144..202a196c9 100644
--- a/HISTORY.mkd
+++ b/HISTORY.mkd
@@ -1,12 +1,23 @@
+1.2.0 - Match 20, 2011
+----------------------
+* [Respect global load path](https://github.com/jnunemaker/twitter/commit/6a629a6a06e115388cce6f1de04f45a4b0707cac)
+* [Use map and Hash[] instead of inject({})](https://github.com/jnunemaker/twitter/commit/a2b0b51618f40b526f554c019a6c83b0bf9a8cdf)
+* [Check headers for Retry-After in absence of retry-after](https://github.com/jnunemaker/twitter/commit/924253214efcedfeb80b4c6fe57dcbb2a7470177)
+* [Fix name of list_add_members resource](https://github.com/jnunemaker/twitter/commit/3adcc1592240be2679f0a2c7d0c390b574abe8f1)
+* [Don't strip @ signs from screen names](https://github.com/jnunemaker/twitter/commit/38c9dd0a720ea857ff6220b28f66db4c780a7fda)
+* [Make <tt>#places_similar</tt> method return a token](https://github.com/jnunemaker/twitter/commit/351e2240717a34d6575a802078077a1681fa4616) ([@nicolassanta](http://twitter.com/#!/nicolassanta))
+
 1.1.2 - February 2, 2011
+------------------------
 * [Opt-in for testing with rubygems-test](https://github.com/jnunemaker/twitter/commit/7d92afc138cac1b751b17682fd166b2603f804c6)
 * [Add support for respond_to? in Twitter class](https://github.com/jnunemaker/twitter/commit/ce64c7818f9b62cf91f1fa5dc2e76a9d4205cd2e) ([@fernandezpablo](http://twitter.com/#!/fernandezpablo))
 
 1.1.1 - January 16, 2011
+------------------------
 * [Don't set cached <tt>screen_name</tt> when creating a new API client](https://github.com/jnunemaker/twitter/commit/ceeed993b16f95582c648e93de03738362ba1d7b)
 
 1.1.0 - January 6, 2011
--------------------
+-----------------------
 * [Overload all methods that require a <tt>screen_name</tt> parameter](https://github.com/jnunemaker/twitter/compare/ecd647e414ac0b0cae96...59cf052ca646a2b79446) ([@gabriel_somoza](http://twitter.com/#!/gabriel_somoza))
 * [Rename <tt>user_screen_name</tt> to <tt>screen_name</tt>](https://github.com/jnunemaker/twitter/commit/4fb4f8a28c967f7d5a2cf295b34548a346900cfd) ([@jalada](http://twitter.com/#!/jalada))
 * [Handle error returns from lookup](https://github.com/jnunemaker/twitter/commit/0553cdbe262f006fae149309ce51a03985ed8fd2) ([@leshill](http://twitter.com/#!/leshill))
diff --git a/lib/twitter/version.rb b/lib/twitter/version.rb
index d3d1535ab..031b6322c 100644
--- a/lib/twitter/version.rb
+++ b/lib/twitter/version.rb
@@ -1,4 +1,4 @@
 module Twitter
   # The version of the gem
-  VERSION = '1.1.2'.freeze unless defined?(::Twitter::VERSION)
+  VERSION = '1.2.0'.freeze unless defined?(::Twitter::VERSION)
 end