From: David Antler <david.a.antler@intel.com>
Date: Wed, 4 May 2016 16:57:46 +0000 (-0700)
Subject: Merge branch 'master' into windows-port
X-Git-Tag: 1.2.0+RC1~258^2~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3390476c32dd0d881b5a775907d6ee95d044938e;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'master' into windows-port

Change-Id: Iefbd0b074e8e654ee143617137c165d05ab56aed
Signed-off-by: David Antler <david.a.antler@intel.com>
---

3390476c32dd0d881b5a775907d6ee95d044938e