Merge Conflict resolved.
[framework/uifw/elementary.git] / ChangeLog