Enabled CURLOPT_SSL_VERIFYPEER and provided root certificates bundle
Fixed warning in composer.json
Merge branch 'staging' of github.com:BenTheDesigner/Dropbox into staging
Little typo.
Merge pull request #54 from mre/patch-1

Little typo.
Added short_url parameter to shares/ call
Simplified bootstrap, added code to Exception, updated accountInfo example
Fixed object to string conversion error caused by inconsistent API response
Updated to support multiple users in the same session (Fixes #68)
Updated to support multiple users in the same session (Fixes #68)
Added support for resuming chunked uploads
Update readme.md
Update readme.md
Manual merge updates
Merge branch 'upstream-merge'

* upstream-merge:
  Manual merge updates
  Update readme.md
  Update readme.md
  Added support for resuming chunked uploads
  Updated to support multiple users in the same session (Fixes #68)
  Updated to support multiple users in the same session (Fixes #68)
  Fixed object to string conversion error caused by inconsistent API response
  Simplified bootstrap, added code to Exception, updated accountInfo example
  Added short_url parameter to shares/ call
  Little typo.
  Fixed warning in composer.json
  Enabled CURLOPT_SSL_VERIFYPEER and provided root certificates bundle

Conflicts:
	Dropbox/API.php
	Dropbox/OAuth/Consumer/ConsumerAbstract.php
	Dropbox/OAuth/Consumer/Curl.php
	Dropbox/OAuth/Storage/Filesystem.php
	Dropbox/OAuth/Storage/PDO.php
	Dropbox/OAuth/Storage/Session.php
	examples/accountInfo.php
	examples/bootstrap.php
	examples/chunkedUpload.php
	examples/getFile.php
	readme.md