Merge "Add CMakeLists.txt.user to gitignore" into release-4-6
authorChristoph Junghans <junghans@votca.org>
Thu, 20 Oct 2011 12:10:18 +0000 (14:10 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 20 Oct 2011 12:10:18 +0000 (14:10 +0200)

Trivial merge