lqingq/SalesforceMobileSDK-iOS — pull request #2 by khawkins (2012-11-12 20:49:51+00:00)
Title: Cleaning up merge conflicts with current branch

There were some updates to the current unstable branch that needed merging. Let's try again!