From a1e5fdddda9f752482caa0ffb744c77f5ecd9ac0 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <alex@alexbilbie.com>
Date: Tue, 28 Aug 2012 12:30:51 +0100
Subject: [PATCH 1/3] Bug fix

---
 src/Oauth2/Resource/Server.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Oauth2/Resource/Server.php b/src/Oauth2/Resource/Server.php
index 0ec835a5..694219b0 100644
--- a/src/Oauth2/Resource/Server.php
+++ b/src/Oauth2/Resource/Server.php
@@ -114,6 +114,9 @@ class Server
     {
         $accessToken = null;
 
+        
+        $_SERVER['REQUEST_METHOD'] = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
+
         // Try and get the access token via an access_token or oauth_token parameter
         switch ($_SERVER['REQUEST_METHOD'])
         {           

From 88185320a8bd41514695cbdf1e6a6194cc1ca769 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <alex@alexbilbie.com>
Date: Tue, 28 Aug 2012 12:30:58 +0100
Subject: [PATCH 2/3] Version bump

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 353aa1d8..28cc02b4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "lncd/Oauth2",
 	"description": "OAuth 2.0 Framework",
-	"version": "0.2",
+	"version": "0.2.1",
 	"homepage": "https://github.com/lncd/OAuth2",
 	"license": "MIT",
 	"require": {

From bdbf9072f6ef15bf06f4045a2f458621768b2cb0 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <alex@alexbilbie.com>
Date: Fri, 7 Sep 2012 12:59:41 +0200
Subject: [PATCH 3/3] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index a1f48c37..eb16e602 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,10 @@ The resource server allows you to secure your API endpoints by checking for a va
 * Support for [JSON web tokens](http://tools.ietf.org/wg/oauth/draft-ietf-oauth-json-web-token/).
 * Support for [SAML assertions](http://tools.ietf.org/wg/oauth/draft-ietf-oauth-saml2-bearer/).
 
+### Client support
+
+* Merge in https://github.com/philsturgeon/codeigniter-oauth2
+
 ---
 
 This code will be developed as part of the [Linkey](http://linkey.blogs.lincoln.ac.uk) project which has been funded by [JISC](http://jisc.ac.uk) under the Access and Identity Management programme.
\ No newline at end of file