Merge "disable OpenMP with all OS X gcc 4.2-based compilers" into release-4-6
authorChristoph Junghans <junghans@votca.org>
Tue, 15 Jan 2013 17:35:19 +0000 (18:35 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 15 Jan 2013 17:35:19 +0000 (18:35 +0100)

Trivial merge