fixed link to style guide
fixed link to style guide
Merge pull request #1012 from JensTimmerman/master

fixed link to style guide
fix remark w.r.t. regex for 'module load'
fix small remark w.r.t. log error in HierarchicalMNS
Merge branch 'develop' into fix_conflicts

Conflicts:
	easybuild/framework/easyblock.py
	easybuild/tools/module_naming_scheme/hierarchical_mns.py
	easybuild/tools/modules.py
	test/framework/modules.py
fix merge conflict resolution failure
fixes for tests and build_log
Merge pull request #1027 from JensTimmerman/fixes

fixes for tests and build_log
Revert "also include libgomp.a in list of libraries for multithreading for GCC"
Merge pull request #1030 from hpcugent/revert-989-fix_libmt_gcc

Revert "also include libgomp.a in list of libraries for multithreading f...
Merge branch 'v1.14.x' into develop
specify location to generate tweaked easyconfigs in
fix bug with repositorypath not honoring --prefix
only reinitialize 'repository' if it is a repository already
also set prefix configuration option in unit test setup
unset $EASYBUILD_PREFIX for config unit tests
properly quote GCC version info to ensure parseable archived easyconfig
change filename for archived easyconfig, to include software name as well
add unit test for parsing archived easyconfig