From: Jim Procter <jprocter@dundee.ac.uk>
Date: Thu, 5 Jun 2014 10:46:39 +0000 (+0100)
Subject: Merge branch 'docs/2_8_1_Release' into Release_2_8_2_Branch
X-Git-Tag: Release_2_8_2b1^2~78
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0e2054d29bc49351f000d478659dc3c4371b251c;hp=0e2054d29bc49351f000d478659dc3c4371b251c;p=jalview.git

Merge branch 'docs/2_8_1_Release' into Release_2_8_2_Branch
JAL-1517 JAL-1503 merge 2.8.1 source code updates to 2_8_2 branch
Conflicts:
	RELEASE
	build.xml
	src/jalview/ext/varna/VarnaCommands.java
	src/jalview/io/AppletFormatAdapter.java
	src/jalview/io/StockholmFile.java
---