pescobar/easybuild-framework — pull request #12 by boegel (2014-11-05 08:23:47+00:00)
Title: sync with develop & resolve conflict

fix for https://github.com/hpcugent/easybuild-framework/pull/1084, there was a conflict w.r.t. `xHOST` vs `xHost`