Merge "[Merge conflict resolved] [elm_colorpalette and elm_searchbar]: removal from...
[framework/uifw/elementary.git] / ChangeLog