* master:
  Release 0.16.4
  [CHANGELOG] Update for 0.16.4

Conflicts:
	CHANGELOG.md
	Gemfile.lock
	lib/cocoapods.rb

* master:
  Rewrite a spec that expects a certain error to be raised.
  Add explicit flattening option to Downloader:Http

Conflicts:
	lib/cocoapods/downloader/http.rb
	spec/unit/http_spec.rb

* master:
  [Gemspec] Fix for Ruby 2.0.0-p0

Conflicts:
	cocoapods.gemspec

See https://bugs.ruby-lang.org/issues/6702

See https://bugs.ruby-lang.org/issues/6702

With the change in 0.16.3, which disabled flattening for zip files
some pods seem to break. While the rationale for the flattening
change is a good one, it would be nice to reenable flattening support
explicitly in the source configuration for your pod.

references https://github.com/CocoaPods/CocoaPods/issues/812

* master:
  Release 0.16.3
  [CHANGELOG] Update for CocoaPods 0.16.3 and Xcodeproj 0.5.0.
  Update for Xcodeproj 0.5.0
  Fix errant apostrophes.
  Fix a couple of minor typos in the unit tests

Conflicts:
	CHANGELOG.md
	Gemfile.lock
	cocoapods.gemspec
	lib/cocoapods.rb
	spec/functional/downloader/git_spec.rb
	spec/functional/downloader_spec.rb
	spec/unit/podfile_spec.rb
	spec/unit/version_spec.rb