Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 22 Sep 2015 09:26:47 +0000 (10:26 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 22 Sep 2015 09:26:47 +0000 (10:26 +0100)
commit77d30786cf24b4894e5cbd8048fd7c50f53b6140
treee9f323b27f183be5a64b03b3f775d58c112d8107
parent06cd115d4259b467d92fb6a698fbfef514a9609c
parentef531032b4d8a0af91bd9a8be6b4d53fbf394c9b
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop