Merge remote-tracking branch 'origin/swift/2.0' into HEAD

inamiy · inamiy · commit f3eb5b852cda · 2015-12-07T07:09:04.000+09:00
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,2 +1,2 @@
-github "Alamofire/Alamofire" "swift-2.0"
-github "duemunk/Async" "feature/Swift_2.0"
+github "Alamofire/Alamofire" ~> 3.1.3
+github "duemunk/Async" ~> 1.6.4
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "Alamofire/Alamofire" "6a4e014844c6309040f49ec00fe1e7d356ab5ff5"
-github "duemunk/Async" "abe23c18d8d3a708a325b5db10231388e1ca5b88"
+github "Alamofire/Alamofire" "3.1.3"
+github "duemunk/Async" "1.6.4"
diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire
@@ -1 +1 @@
-Subproject commit 6a4e014844c6309040f49ec00fe1e7d356ab5ff5
+Subproject commit 268a22bff9d660ecd1af260906aa2eb72d261894
diff --git a/Carthage/Checkouts/Async b/Carthage/Checkouts/Async
@@ -1 +1 @@
-Subproject commit abe23c18d8d3a708a325b5db10231388e1ca5b88
+Subproject commit 3c324366ceb02e69d3ff66401ea6fb6e665ec663
