* master:
  Updated master repo fixture.
  [Specs] Fix for master repo update & small performance improvements.

Conflicts:
	spec/functional/command/list_spec.rb
	spec/functional/command/push_spec.rb
	spec/functional/command/repo_spec.rb
	spec/functional/command/setup_spec.rb
	spec/spec_helper/temporary_repos.rb
	spec/unit/resolver_spec.rb
	spec/unit/source_spec.rb

* core-extraction: (92 commits)
  Minor fixes.
  [Changelog]
  [SpecHelper] More refinement for bacon support.
  [TargetInstaller] Extracted XCConfig generation to Generator::XCConfing.
  Release 0.16.0
  [RakeFile] More fixes for release task.
  [Gemspec] Require xcodeproj 0.4.0.
  [RakeFile] Minor fix for release task.
  [TargetInstaller] Fixed spec.
  [Command::Search] Catch DSL errors and present a warning.
  [UI] Minor adaptation for Core extraction.
  [List] Adapted for Core extraction.
  [Gemfile] Updated bundle.
  [Sandbox] Adapted for changes in Core.
  [LocalPod] Adapted for Core extraction.
  [Fixtures] Updates.
  [SpecHelper] Improved bacon support.
  [Sandobox] Adapted for Core extraction.
  [Resolver] adapted for Core extraction
  [Linter] Adoped Core Linter and renamed to DeepLinter (WIP).
  ...

Conflicts:
	lib/cocoapods/command/install.rb
	lib/cocoapods/command/linter.rb
	lib/cocoapods/installer.rb
	lib/cocoapods/lockfile.rb
	lib/cocoapods/resolver.rb
	spec/unit/installer_spec.rb

* master: (29 commits)
  Release 0.16.0
  [RakeFile] More fixes for release task.
  [Gemspec] Require xcodeproj 0.4.0.
  [RakeFile] Minor fix for release task.
  [FileList] User rake 1.9.4.
  Release 0.16.0.rc5
  [Travis] Need to wait a bit longer for standard Ruby 2 support.
  [Travis] Maybe I should use the alias?
  [Travis] Ruby 2.0.0 preview 1, yo!
  [Integrator] Properly detect if the lib has been integrated.
  [Lockfile] An inline podspec should always be considered needing installation.
  [CHANGELOG] Update with inline podspec deprecation.
  [Podfile] Update doc regarding the usage of `:podspec` instead of an inline spec.
  [Podfile] Inline specs are deprecated, use the `:podspec` option.
  Fix typo in podspec comments
  Release 0.16.0.rc4
  [FileList] Fix for Rake 0.9.3
  Fixed typo in spec template
  Release 0.16.0.rc3
  [gemspec] Update Xcodeproj dependency.
  ...

Conflicts:
	CHANGELOG.md
	Gemfile.lock
	cocoapods.gemspec
	lib/cocoapods.rb
	lib/cocoapods/installer/user_project_integrator.rb
	lib/cocoapods/lockfile.rb
	lib/cocoapods/podfile.rb
	lib/cocoapods/resolver.rb
	spec/functional/user_project_integrator_spec.rb

https://github.com/jimweirich/rake/issues/142