Merge "Fix for underlined text." into devel/master

author Adeel Kazmi <adeel.kazmi@samsung.com>

Thu, 20 Aug 2015 13:22:12 +0000 (06:22 -0700)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Thu, 20 Aug 2015 13:22:13 +0000 (06:22 -0700)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Thu, 20 Aug 2015 13:22:12 +0000 (06:22 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 20 Aug 2015 13:22:13 +0000 (06:22 -0700)
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Thu, 20 Aug 2015 13:22:12 +0000 (06:22 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 20 Aug 2015 13:22:13 +0000 (06:22 -0700)