* 'master' of github.com:CocoaPods/CocoaPods:
  Fix integration spec, which was trying to assign a source to subspecs.
  Fix spec that was using a newer version of lib than expected.
  Update spec repo fixture to latest 0.6 and fix CP version checking.
  Fix a RubyGems specific version spec failure.
  Update SSToolkit fixture submodule.
  Fix version number.

Conflicts:
	lib/cocoapods/command/repo.rb