From: Jim Procter <jprocter@dundee.ac.uk>
Date: Mon, 3 Nov 2014 16:02:18 +0000 (+0000)
Subject: Merge branch 'develop' into features/JAL-1152annotationSorting
X-Git-Tag: Release_2_8_2b1^2~36^2~11
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8c0f33de9bd3c211883eddcc313ebc7978f7b0b5;p=jalview.git

Merge branch 'develop' into features/JAL-1152annotationSorting
---

8c0f33de9bd3c211883eddcc313ebc7978f7b0b5