Merge branch 'master' of
ssh://ivinnykov@git.eclipse.org/gitroot/www.eclipse.org/subversive.git

Conflicts:
	sidebars/main.php