Merge branch 'release/1.2.6' into develop

Author: toto

NXOAuth2Client.podspec

@@ -1,10 +1,10 @@
 Pod::Spec.new do |s|
   s.name     = 'NXOAuth2Client'
-  s.version  = '1.2.5'
+  s.version  = '1.2.6'
   s.license  = {
     :type => 'BSD',
     :text => <<-LICENSETEXT
-                Copyright © 2012, nxtbgthng GmbH
+                Copyright © 2012-2014, nxtbgthng GmbH
 
                 All rights reserved.
 
@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
                 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     LICENSETEXT
   }
-  s.summary  = 'Client library for OAuth2 (currently built against draft 10 of the OAuth2 spec).'
+  s.summary  = 'Client library for OAuth2 (currently built against draft 10 of the OAuth2 spec) but can support several drafts.'
   s.homepage = 'https://github.com/nxtbgthng/OAuth2Client'
   s.author   = { 'nxtbgthng' => '[email protected]'}
   s.source   = { :git => 'https://github.com/nxtbgthng/OAuth2Client.git', :tag => "v#{s.version}" }

README.md

@@ -18,6 +18,18 @@ authentication flow.
 Getting the sources is as easy as doing a:  
 `git clone git://github.com/nxtbgthng/OAuth2Client.git`
 
+### Adding the library to your project using CocoaPods
+[CocoaPods](http://cocoapods.org/) is a dependency manager for Xcode projects. It manages the above
+installation steps automatically.
+
+In order to install the library this way add the following line to your `Podfile`:
+
+```pod 'NXOAuth2Client', '~> 1.2.6'```
+
+and run the following command `pod install`.
+
+*Note:* CocoaPods is now the preferred way to integrate NXOAuth2Client into XCode
+
 ### Manually including the library in your Xcode project
 
 #### iOS projects
@@ -46,15 +58,7 @@ to your targets *Link Binary With Libraries*)
 *Using the library as a framework in desktop applications is fairly untested. Please
 [report any issues](http://github.com/nxtbgthng/OAuth2Client/issues) and help in making the library better.*
 
-### Adding the libary to your project using CocoaPods
-[CocoaPods](http://cocoapods.org/) is a dependency manager for Xcode projects. It manages the above
-installation steps automatically.
 
-In order to install the library this way add the following line to your `Podfile`:
-
-```pod 'NXOAuth2Client', '~> 1.2.2'```
-
-and run the following command `pod install`.
 
 ## Using the OAuth2Client
 
@@ -184,6 +188,12 @@ NSURLRequest *sigendRequest = [theRequest signedURLRequest];
 // Invoke the request with you preferd method
 </pre>
 
+## Contributing & Pull Requests
+
+Patches and pull requests are welcome! We are sorry if it takes a while to review them, but sooner or later we will get to yours.
+
+Not that we are using the [git-flow](http://nvie.com/posts/a-successful-git-branching-model/) model of branching and releasing, so **please make pull requests against the develop branch** to make merging them easier.
+
 ## BSD License
 
 Copyright © 2012, nxtbgthng GmbH