Merge branch 'develop' into 99_function_renaming
Conflicts: easybuild/build.py easybuild/easyblocks/o/openfoam.py easybuild/easyblocks/p/pasha.py easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb easybuild/framework/application.py easybuild/framework/easyconfig.py
Please register or sign in to comment