forcedotcom/SalesforceMobileSDK-iOS — pull request #864 by khawkins (2014-12-05 01:45:41+00:00)
Title: Merging master back to unstable

(Did it backwards—unstable then master—so I had to merge back to unstable again. Alas.)