Merge "Uncrustified code changes since 4.6" into release-4-6
authorChristoph Junghans <junghans@votca.org>
Sat, 2 Mar 2013 23:01:24 +0000 (00:01 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sat, 2 Mar 2013 23:01:24 +0000 (00:01 +0100)

Trivial merge