* 'develop' of github.com:CocoaPods/CocoaPods:
  [Rakefile] Release from develop branch.

Conflicts:
	Rakefile

* 'master' of github.com:CocoaPods/CocoaPods:
  Array#flatten! returns nil if no modifications were made (i.e., array contains no subarrays.)

Spec heredocs

* 'master' of https://github.com/playhaven/CocoaPods:
  [tweak] remove .to_a method since unnecessary with splat operator
  [fix] unit tests now passing
  [fix] small syntax error
  [add] ability to specify :branch in Podfiles and Podspecs

Conflicts:
	.gitignore
	lib/cocoapods/downloader/git.rb
	spec/fixtures/banana-lib.tar.gz
	spec/functional/downloader_spec.rb

* 'develop' of github.com:CocoaPods/CocoaPods:
  Handle extraction paths with spaces

Handle extraction paths with spaces for http sources

Closes #346.

Array#flatten! returns nil if no modifications were made

We probably want just `flatten` rather than `flatten!`

Like `pod spec lint https://github.com/tibr/Specs/raw/123277fe658059c6efd5801aee1e504f55d488f6/Kiwi/1.1.0/Kiwi.podspec --verbose'