NUBIC/surveyor — pull request #280 by jdzak (2012-03-10 04:06:46+00:00)
Title: Merge ios branch into master?

We should merge the ios branch into master since we'll need this for the ncs core sync'ing. Is anyone opposed?