[Merge conflict resolved]
[framework/uifw/elementary.git] / NEWS