Merge "Merge branch release-4-6 into master"

author Teemu Murtola <teemu.murtola@gmail.com>

Sun, 1 Sep 2013 09:39:18 +0000 (11:39 +0200)

committer Gerrit Code Review <gerrit@gerrit.gromacs.org>

Sun, 1 Sep 2013 09:39:18 +0000 (11:39 +0200)
author Teemu Murtola <teemu.murtola@gmail.com>
Sun, 1 Sep 2013 09:39:18 +0000 (11:39 +0200)
committer Gerrit Code Review <gerrit@gerrit.gromacs.org>
Sun, 1 Sep 2013 09:39:18 +0000 (11:39 +0200)
diff --cc CMakeLists.txt
Simple merge
diff --cc admin/installguide/installguide.tex
Simple merge
author	Teemu Murtola <teemu.murtola@gmail.com>
	Sun, 1 Sep 2013 09:39:18 +0000 (11:39 +0200)
committer	Gerrit Code Review <gerrit@gerrit.gromacs.org>
	Sun, 1 Sep 2013 09:39:18 +0000 (11:39 +0200)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
admin/installguide/installguide.tex	patch \|	diff1 \|	diff2 \|	blob \| history