Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud
authorjoelbandi <joelvivekbandi@gmail.com>
Fri, 5 Aug 2016 00:13:53 +0000 (17:13 -0700)
committerjoelbandi <joelvivekbandi@gmail.com>
Fri, 5 Aug 2016 00:13:53 +0000 (17:13 -0700)

Trivial merge