Merge branch release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 14 Mar 2014 18:08:48 +0000 (19:08 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 17 Mar 2014 15:45:30 +0000 (16:45 +0100)
commiteab39e78f3f45662bb25fa047510b05a0149880a
treec817e1f2dc0d4069799c0075e9f8634ab5c858f2
parent23d79229d99e4ff53bf9356c22f57727450f01af
parentb207685897ed4ab3cea11008c29d4b6005cf324d
Merge branch release-4-6

Conflicts:
src/gromacs/pulling/pull_rotation.c
Adopted the bugfixes from release-4-6

Uncrustified incoming code

Change-Id: I7d90bb49ef83750b9607f677e97a94f2b5793eeb
src/gromacs/gmxana/gmx_tune_pme.c
src/gromacs/pulling/pull_rotation.c