Merge branch 'develop' into features/JAL-2316 features/JAL-2316
authorJim Procter <jprocter@issues.jalview.org>
Thu, 9 Feb 2017 11:50:07 +0000 (11:50 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 9 Feb 2017 11:50:07 +0000 (11:50 +0000)
1  2 
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/APopupMenu.java

Simple merge
Simple merge
Simple merge