Merge remote-tracking branch 'stig/patch-1'

jspahrsummers · jspahrsummers · commit f1cb24b9c2cc · 2012-08-27T03:29:25.000-07:00
Conflicts:
	Objective-C.gitignore
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
@@ -15,3 +15,4 @@ xcuserdata
 profile
 *.moved-aside
 DerivedData
+.idea/
