JensTimmerman/easybuild-easyconfigs — pull request #16 by boegel (2014-12-09 11:28:28+00:00)
Title: sync with develop & resolve conflicts

required for https://github.com/hpcugent/easybuild-easyconfigs/pull/1017