From 7f89dc35460aa55cffa18c54c57a577453e58181 Mon Sep 17 00:00:00 2001
From: Pablo Fernandez <fernandezpablo85@gmail.com>
Date: Mon, 15 Aug 2011 23:35:15 -0300
Subject: [PATCH] documented changes so far

---
 README.textile | 2 ++
 changelog.txt  | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/README.textile b/README.textile
index a03660b..e7727a8 100644
--- a/README.textile
+++ b/README.textile
@@ -38,6 +38,8 @@ h3. Supports all major 1.0a and 2.0 OAuth APIs out-of-the-box
 
 * Yammer
 
+* Windows Live
+
 * and many more! check the "examples folder":http://github.com/fernandezpablo85/scribe-java/tree/master/src/test/java/org/scribe/examples
 
 h3. Small and modular
diff --git a/changelog.txt b/changelog.txt
index 29c5a00..74e36eb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -56,3 +56,7 @@
   * FEATURE: Added support for Vkontakte (thanks dotbg)
   * FEATURE: Added Sohu Weibo, Netease Weibo & Sina Weibo Apis (thanks Arthur Wang)
   * FEATURE: Added support for persistent Http Connections (thanks Craig Minton)
+[1.2.2]
+  * FIX: Fixed error while setting connection timeouts
+  * FEATURE: Plurk Api
+  * FEATURE: Windows Live Api