Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud
authorjoelbandi <joelvivekbandi@gmail.com>
Tue, 26 Jul 2016 12:56:50 +0000 (05:56 -0700)
committerjoelbandi <joelvivekbandi@gmail.com>
Tue, 26 Jul 2016 12:56:50 +0000 (05:56 -0700)

Trivial merge