From 19721c3f53f0162473af507c86f346372ab20620 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 13 Oct 2015 10:31:00 +0100
Subject: [PATCH] Bump to 0.2.2 and update CHANGELOG

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 README.md    |  3 +--
 package.json |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 780481327..c9191083a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+Changes in 0.2.2
+================
+
+Bug fixes:
+ * Null pointer fixes for VoIP calling and push notification processing.
+ * Set the `Content-Type` to `application/octet-stream` in the event that the
+   file object has no `type`.
+
+New methods:
+ * Added `MatrixClient.getCasServer()` which calls through to the HTTP endpoint
+   `/login/cas`.
+ * Added `MatrixClient.loginWithCas(ticket, service)` which logs in with the
+   type `m.login.cas`.
+ * Added `MatrixClient.getHomeserverUrl()` which returns the URL passed in the
+   constructor.
+ * Added `MatrixClient.getIdentityServerUrl()` which returns the URL passed in
+   the constructor.
+ * Added `getLastModifiedTime()` to `RoomMember`, `RoomState` and `User` objects.
+   This makes it easier to see if the object in question has changed, which can
+   be used to improve performance by only rendering when these objects change.
+
 Changes in 0.2.1
 ================
 
diff --git a/README.md b/README.md
index 4238e505a..a2e565924 100644
--- a/README.md
+++ b/README.md
@@ -227,8 +227,7 @@ host the API reference from the source files like this:
   $ python -m SimpleHTTPServer 8005
 ```
   
-Then visit ``http://localhost:8005`` to see the API docs. By
-default, ``jsdoc`` produces HTML in the ``out`` folder.
+Then visit ``http://localhost:8005`` to see the API docs.
 
 Contributing
 ============
diff --git a/package.json b/package.json
index 8fa0b4b01..0971d650b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-js-sdk",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Matrix Client-Server SDK for Javascript",
   "main": "index.js",
   "scripts": {