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)
commit44449c1601f6b5d40427da8dfddc2781e2e9ba79
treef233fcf02d79a549d47434a79b45cf901a732960
parent3798518322b44edfe6e2cdb8f5dd43a9b935e404
parenta48cd30bfc94181b47f39f5779fe5e990d224a87
Merge "Uncrustified code changes since 4.6" into release-4-6