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

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

8d98d7ffc5c6ad61d7ff662fb88692c23a9791e5