Eloy Durán a164a801aa Merge branch 'master' into clean_paths ...

Conflicts:
	BlocksKit/0.5.0/BlocksKit.podspec
	BlocksKit/0.9.0/BlocksKit.podspec
	BlocksKit/0.9.5/BlocksKit.podspec
	BlocksKit/1.0.0/BlocksKit.podspec
	BlocksKit/1.0.1/BlocksKit.podspec
	BlocksKit/1.0.2/BlocksKit.podspec
	BlocksKit/1.0.3/BlocksKit.podspec
	BlocksKit/1.0.4/BlocksKit.podspec
	BlocksKit/1.0.5/BlocksKit.podspec
	BlocksKit/1.0.6/BlocksKit.podspec
	HockeySDK/2.2.6/HockeySDK.podspec
	ZBarSDK/1.2.2/ZBarSDK.podspec
	ZipKit/0.0.1/ZipKit.podspec

2012-07-20 10:38:25 +02:00

..

0.0.1

Removed GitHub warnings.

2012-06-29 15:37:34 +02:00

1.0.0

Merge branch 'master' into clean_paths

2012-07-20 10:38:25 +02:00