Merge branch 'hotfix/JAL-1521' into Release_2_8_2_Branch
authorJim Procter <jprocter@issues.jalview.org>
Thu, 23 Oct 2014 22:08:56 +0000 (23:08 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 23 Oct 2014 22:08:56 +0000 (23:08 +0100)
commit9493ac8f3b6a02d3cf9747ed6c0d6cf407d284e8
tree1c2526a925442ac727f1fe17dd775e5959201d03
parente23bc8f3dd3449ecc15ae868cd5e11b9c6350637
parentc2ae0a30d775dff2af90f283a3be83f619e04bc4
Merge branch 'hotfix/JAL-1521' into Release_2_8_2_Branch

Conflicts:
.classpath
RELEASE
src/castor.properties
.classpath
RELEASE
src/castor.properties