Merge branch 'hotfix/JAL-1521' into develop
authorJim Procter <jprocter@issues.jalview.org>
Thu, 23 Oct 2014 22:02:54 +0000 (23:02 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 23 Oct 2014 22:02:54 +0000 (23:02 +0100)
commit3b20366969476761c4756c0d19789953a66f26af
treea93c5ef3c580f3d6609f347bfc5c7d8ecf21557e
parentbb8d445ac21fbb53ec754d9acdd18a693e6d80d9
parentc2ae0a30d775dff2af90f283a3be83f619e04bc4
Merge branch 'hotfix/JAL-1521' into develop

Conflicts:
.classpath
RELEASE
.classpath