Merge remote-tracking branch 'origin/develop'

Conflicts: Simperium.podspec
Simperium · Jan 20, 2014 · 0ca3a56 · 0ca3a56
2 parents d56e722 + 7c85d40
commit 0ca3a56
Show file tree

Hide file tree

Showing 33 changed files with 1,306 additions and 722 deletions.
diff --git a/External/SFHFKeychainUtils/SFHFKeychainUtils.m b/External/SFHFKeychainUtils/SFHFKeychainUtils.m