Merge branch 'master' of github.com:EHER/OAuth

Conflicts:
	.gitignore
	composer.json

.gitignore

@@ -1,3 +1,3 @@
 *.swp
-composer.lock
 composer.phar
+composer.lock

composer.json

@@ -4,14 +4,12 @@
     "description": "OAuth 1 PHP Library",
     "keywords": ["oauth"],
     "homepage": "https://github.com/EHER/OAuth",
-    "psr-0": {
-        "OAuth": "src/"
-    },
-    "authors": 
-    {
-        "name": "Andy Smith",
-        "homepage": "http://term.ie/"
-    },
+    "authors":[
+        {
+            "name": "Andy Smith",
+            "homepage": "http://term.ie/"
+        }
+    ],
     "require": {
         "php": ">=5.3.0"
     }

src/Eher/OAuth/HmacSha1.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Eher\OAuth\SignatureMethod;
+namespace Eher\OAuth;
 
 /**
  * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104]

src/Eher/OAuth/PlainText.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Eher\OAuth\SignatureMethod;
+namespace Eher\OAuth;
 
 /**
  * The PLAINTEXT method does not provide any security protection and SHOULD only be used

src/Eher/OAuth/SignatureMethod.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Eher\OAuth\SignatureMethod;
+namespace Eher\OAuth;
 
 /**
  * A class for implementing a Signature Method