Merge changes I26f3edb0,Iba714851 into new_text
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text /
2015-02-13 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 33/35433/3