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

Conflicts:
	Objective-C.gitignore
This commit is contained in:
Justin Spahr-Summers 2012-08-27 03:29:25 -07:00
commit f1cb24b9c2

View File

@ -15,3 +15,4 @@ xcuserdata
profile profile
*.moved-aside *.moved-aside
DerivedData DerivedData
.idea/