* integration_take_2:
  [Specs Integration] Ingore CocoaPods version in lockfiles

* integration_take_2:
  [Specs Integration] Preserve the results of each test.

* integration_take_2_0_17_test:
  [Specs Integration] Clean implementation a bit.
  [TargetInstaller] Sort headers in xcconfig.
  [Bundle] update
  Add .hg folders to specs repos
  [Gitignore] Don't ignore .hg folders
  [Specs Integration] Added more tests.
  [Specs Integration] Clean up implementation.
  [Specs Integration] Skip unreliable tests.
  [Installer] Don't show using existing documentation message if docs should be skipped
  [Specs] Added integration specs
  [Specs Integration] Add check for output.
  Integrations tests part 2

* integration_take_2:
  [Specs Integration] Clean implementation a bit.
  [TargetInstaller] Sort headers in xcconfig.
  [Bundle] update
  Add .hg folders to specs repos
  [Gitignore] Don't ignore .hg folders
  [Specs Integration] Added more tests.
  [Specs Integration] Clean up implementation.
  [Specs Integration] Skip unreliable tests.
  [Installer] Don't show using existing documentation message if docs should be skipped
  [Specs] Added integration specs
  [Specs Integration] Add check for output.
  Integrations tests part 2

Conflicts:
	.gitignore
	Gemfile.lock
	lib/cocoapods/installer.rb
	lib/cocoapods/installer/target_installer.rb

* master:
  [Specs] Fix for master repo changes
  Never consider aggregate targets for integration. Fixes #729 & 784.
  Let’s get Travis to build again.
  Updated downloader spec to check for unflattened zipfiles
  Do not flatten the zip files downloaded via http

Conflicts:
	lib/cocoapods/downloader/http.rb
	lib/cocoapods/installer/user_project_integrator.rb
	spec/functional/downloader_spec.rb
	spec/unit/installer/user_project_integrator_spec.rb
	spec/unit/resolver_spec.rb
	spec/unit/source_spec.rb

* master:
  [Specs] Fix for master repo changes

Do not flatten the zip files downloaded via http

* master:
  Release 0.16.2
  Bump Xcodeproj dependency.
  Update CHANGELOG
  Make specs green.
  Update bundle.
  Run on the new Travis CI mac workers on both system Ruby and 1.9.3-p327.
  Generate Pods target in Mac OS X with the specified deployment target.
  Disable libSystem objects for ARC libs that target older platforms.
  Fix podspec in Podfile with no options.
  Add install note for RVM users about symlinking GCC to LLVM-GCC.
  Removed comments from Mercurial sample podspec used in tests.
  Added support for pre-download over Mercurial.
  Quote storyboard and xib paths

Conflicts:
	CHANGELOG.md
	Gemfile.lock
	cocoapods.gemspec
	examples/AFNetworking Mac Example/Podfile.lock
	examples/AFNetworking iOS Example/Podfile.lock
	examples/MGSplitView/Podfile.lock
	examples/RKTwitter/Podfile.lock
	examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj
	examples/RelativePathProject/Podfile.lock
	examples/SSCatalog/Podfile.lock
	examples/SSCatalog/SSCatalog.xcodeproj/project.pbxproj
	examples/TargetTest/Podfile.lock
	lib/cocoapods.rb
	lib/cocoapods/dependency.rb
	lib/cocoapods/platform.rb
	lib/cocoapods/podfile.rb
	lib/cocoapods/project.rb
	lib/cocoapods/specification.rb
	spec/fixtures/mercurial-repo/.hg/dirstate
	spec/fixtures/mercurial-repo/.hg/last-message.txt
	spec/fixtures/mercurial-repo/.hg/store/00changelog.i
	spec/fixtures/mercurial-repo/.hg/store/00manifest.i
	spec/fixtures/mercurial-repo/.hg/store/fncache
	spec/fixtures/mercurial-repo/.hg/store/undo
	spec/fixtures/mercurial-repo/.hg/undo.desc
	spec/fixtures/mercurial-repo/.hg/undo.dirstate
	spec/integration_spec.rb
	spec/unit/dependency_spec.rb
	spec/unit/local_pod_spec.rb
	spec/unit/podfile_spec.rb
	spec/unit/specification_spec.rb