Merge release-4-5-patches into release-4-6
authorRoland Schulz <roland@utk.edu>
Fri, 11 Jan 2013 15:45:13 +0000 (10:45 -0500)
committerRoland Schulz <roland@utk.edu>
Fri, 11 Jan 2013 15:45:58 +0000 (10:45 -0500)
commitcdc3742c1339a85961545424b04c06713e801fca
tree238abc957a30ce44b9e2c3e932c18edb2a9da11d
parentf3dd8cb7ae23accff657551523d05657262a72ff
parente86b3a39ca370d7b593cc9395c143170207c9b44
Merge release-4-5-patches into release-4-6

Conflicts:
src/kernel/readir.c (trivial)

Change-Id: I6def10cca9a25c0587694ea77a5a6f7a43ca308d
src/gmxlib/sfactor.c
src/kernel/hizzie.c
src/kernel/readir.c
src/tools/gmx_genpr.c
src/tools/gmx_rmsf.c