Merge branch 'hotfix/JAL-1530' into Release_2_8_2_Branch
authorj.procter@dundee.ac.uk <jprocter@jims-mbp-2.lan>
Thu, 3 Jul 2014 18:27:00 +0000 (11:27 -0700)
committerj.procter@dundee.ac.uk <jprocter@jims-mbp-2.lan>
Thu, 3 Jul 2014 18:27:00 +0000 (11:27 -0700)
commitc3e47d769fd4d7556a2f266ae7a7047f7541aa11
tree5aa2d071966d505725c96e7a15c0f1824a135357
parent5c33de4092732a61c2bc4ab3cb76b773752ad37a
parent93d1682e83a5069aea9c1797ad8d8c2c1407b92f
Merge branch 'hotfix/JAL-1530' into Release_2_8_2_Branch

Conflicts:
src/jalview/gui/PopupMenu.java
src/jalview/gui/PopupMenu.java