Conflicts:
	branding.spec
	notes/license.all.html.in
	notes/license.ru.html.in
	notes/release-notes.all.html.in
	notes/release-notes.ru.html.in