Merge remote-tracking branch 'origin/develop' into features/JAL-2316

author kiramt <k.mourao@dundee.ac.uk>

Mon, 9 Jan 2017 11:47:12 +0000 (11:47 +0000)

committer kiramt <k.mourao@dundee.ac.uk>

Mon, 9 Jan 2017 11:47:12 +0000 (11:47 +0000)
author kiramt <k.mourao@dundee.ac.uk>
Mon, 9 Jan 2017 11:47:12 +0000 (11:47 +0000)
committer kiramt <k.mourao@dundee.ac.uk>
Mon, 9 Jan 2017 11:47:12 +0000 (11:47 +0000)
diff --cc resources/lang/Messages.properties
Simple merge
diff --cc resources/lang/Messages_es.properties
Simple merge
diff --cc src/jalview/appletgui/APopupMenu.java
Simple merge
author	kiramt <k.mourao@dundee.ac.uk>
	Mon, 9 Jan 2017 11:47:12 +0000 (11:47 +0000)
committer	kiramt <k.mourao@dundee.ac.uk>
	Mon, 9 Jan 2017 11:47:12 +0000 (11:47 +0000)
		1	2
resources/lang/Messages.properties	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/Messages_es.properties	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/appletgui/APopupMenu.java	patch \|	diff1 \|	diff2 \|	blob \| history