From: David Antler <david.a.antler@intel.com>
Date: Wed, 27 Apr 2016 21:30:57 +0000 (-0700)
Subject: Merge branch 'master' into windows-port
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9f543a2d95dc0db88c2aa82a8ac880c2ab6296d;p=contrib%2Fiotivity.git

Merge branch 'master' into windows-port

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

b9f543a2d95dc0db88c2aa82a8ac880c2ab6296d