tree fef3d3ce1245f3c7ad45e684e04f598dc8d41aa9
parent 7f66507ec1267462e0f5343546e04e0edd739b0c
parent 7df76cdcfbff40e1684999a1696509ce9b90f7fa
author ivinnykov <igor.vinnykov@polarion.com> 1429889820 +0300
committer ivinnykov <igor.vinnykov@polarion.com> 1429889820 +0300

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

Conflicts:
	sidebars/main.php