Merge branch 'svn_merge'
[framework/uifw/elementary.git] / ChangeLog