CHANGELOG.md
Merge branch 'master' of https://github.com/yupe/yupe
NestedSetsConverter test fix
Merge branch 'master' of https://github.com/yupe/yupe
small theme fix
improved wording for some strings
Merge pull request #1245 from samdark/english-wording

improved wording for some strings
small optimizations
Merge branch 'master' of https://github.com/yupe/yupe
Additions for pull #1245
Additions for #1185 by @sam_dark
commit for merging
Merge branch 'master' of github.com:yupe/yupe

Conflicts:
	protected/modules/user/messages/ru/user.php
fix process of migration to nestedsets comments
fix process of migration to nestedsets comments
Merge branch 'master' of https://github.com/yupe/yupe
themefix
small fix
UPD: fix #1249: В контроллере Post, исправлена сортировка постов при поиске по тегу
UPD: append fix #1249 to CHANGELOG