From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 5 Jun 2015 15:28:56 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-653_gffalignments
X-Git-Tag: Release_2_10_0~296^2~157
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=09d81d7aa46a618d636a8ca3fda75d4252650564

Merge branch 'develop' into features/JAL-653_gffalignments
---

09d81d7aa46a618d636a8ca3fda75d4252650564