Merge "allow -append to overrule unsupported file locking" into release-4-5-patches
authorBerk Hess <hess@kth.se>
Tue, 24 Apr 2012 11:35:33 +0000 (13:35 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 24 Apr 2012 11:35:33 +0000 (13:35 +0200)

Trivial merge