From: Markus Jung <markus.jung85@gmail.com>
Date: Wed, 18 Nov 2015 20:02:00 +0000 (+0900)
Subject: Merge branch 'master' into resource-container
X-Git-Tag: 1.2.0+RC1~634^2^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea38102e4a3499917945d5244d4e89ec2c8bf94b;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'master' into resource-container

Change-Id: I897c55a73b18288a0686a6d6770cf8fd8dcf1f2c
Signed-off-by: Markus Jung <markus.jung85@gmail.com>
---

ea38102e4a3499917945d5244d4e89ec2c8bf94b