Merge "Set version info for 4.6.x release series" into release-4-6
authorChristoph Junghans <junghans@votca.org>
Mon, 21 Jan 2013 20:44:02 +0000 (21:44 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 21 Jan 2013 20:44:02 +0000 (21:44 +0100)

Trivial merge