tree 5956a34d43b2d85199325638d5adac9f5ce11cad
parent 883f0e176470275767e252ef91246740ab8e1f11
parent dac225520c988ab0e202878fd3802dc24c5ca09a
author ahaugommard <anne.haugommard@atos.net> 1470313754 +0200
committer ahaugommard <anne.haugommard@atos.net> 1470313754 +0200

Merge branch 'master' of https://git.eclipse.org/r/www.eclipse.org/gendoc

# Conflicts:
#	downloads/download.php
#	roadmap/roadmap.php