From: j.procter@dundee.ac.uk <jprocter@jims-mbp-2.lan>
Date: Thu, 3 Jul 2014 18:27:00 +0000 (-0700)
Subject: Merge branch 'hotfix/JAL-1530' into Release_2_8_2_Branch
X-Git-Tag: Release_2_8_2b1^2~61
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c3e47d769fd4d7556a2f266ae7a7047f7541aa11;hp=c3e47d769fd4d7556a2f266ae7a7047f7541aa11;p=jalview.git

Merge branch 'hotfix/JAL-1530' into Release_2_8_2_Branch

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