Commit af1723ef authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge branch 'develop' into Python279

Conflicts:
	easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a.eb
parents 4c97abc8 b6e57618
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment