From: hunje.yeon <hunje.yeon@samsung.com>
Date: Wed, 24 Jun 2015 07:34:16 +0000 (+0900)
Subject: Merge branch 'master' into resource-manipulation
X-Git-Tag: 1.2.0+RC1~1430^2~106
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e57727a4efb241a333a5d0a614d025bc032cf573;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'master' into resource-manipulation

Update the last changes of 'master' into 'resource-manipulation' branch

Change-Id: I1ddfc5d14ea01a46e52f1e6d5efe73732225d67d
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
---

e57727a4efb241a333a5d0a614d025bc032cf573