From: Jeongmo Yang <jm80.yang@samsung.com>
Date: Tue, 20 Dec 2016 08:32:15 +0000 (+0900)
Subject: Merge branch 'tizen' into tizen_3.0
X-Git-Tag: submit/tizen_3.0/20161220.100802^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ee3c6b4059e715cfede2418a0619dd97d60d91f;p=platform%2Fupstream%2Fmurphy.git

Merge branch 'tizen' into tizen_3.0

Conflicts:
	packaging/murphy.spec
	src/common/glib-glue.c

Change-Id: I6b37d638f2dcf16593a8ab86ae48fdcd6b8e742a
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
---

3ee3c6b4059e715cfede2418a0619dd97d60d91f