Merge branch 'develop' into trialMerge
[jalview.git] / src / jalview / io / FileFormatException.java
2016-07-12 gmungocFileFormat enum new types