From: Paul Wisbey <p.wisbey@samsung.com>
Date: Wed, 4 Mar 2015 19:26:43 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/tizen' into new_text
X-Git-Tag: new_text_0.1~20
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=297b1b9a9b6ed72fe98d5afb018ff4d1c951ce7d;hp=-c

Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	dali-toolkit/internal/controls/text-input/text-input-impl.cpp

Change-Id: Iab734e2329bb8c1380fe115b5924b734ad10c759
---

297b1b9a9b6ed72fe98d5afb018ff4d1c951ce7d