tree 42aeb2c33d501cd829ed37eaaa2577931c15999f
parent 67a2cbf1e50ea057e50a0d6ea05d0fda7556e809
parent f86ab08287c7ef68fabbd50e5f54e2b6545f8075
author Christopher Guindon <chris.guindon@eclipse.org> 1402495361 -0400
committer Christopher Guindon <chris.guindon@eclipse.org> 1402495361 -0400

Merge branch 'solstice'

Conflicts:
	index.php


Signed-off-by: Christopher Guindon <chris.guindon@eclipse.org>