Merge branch 'master' into swift2

ikesyo · ikesyo · commit d25fe8ebeef0 · 2015-10-01T18:26:08.000+09:00
Conflicts:
	Cartfile
	Cartfile.resolved
diff --git a/ReactiveTask/Info.plist b/ReactiveTask/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/ReactiveTaskTests/Info.plist b/ReactiveTaskTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
