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