From: Jim Procter <jprocter@dundee.ac.uk>
Date: Wed, 12 Nov 2014 14:56:03 +0000 (+0000)
Subject: Merge branch 'features/typed_annotations_calcId' into develop
X-Git-Tag: Jalview_2_9~155^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a14b79095a6e1e30b926869fdb045c01695418e3;p=jalview.git

Merge branch 'features/typed_annotations_calcId' into develop
---

a14b79095a6e1e30b926869fdb045c01695418e3