From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 2 Jun 2015 15:51:56 +0000 (+0100)
Subject: Merge branch 'features/JAL-1641_JSON-extension' into develop
X-Git-Tag: Release_2_10_0~644
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a8a714840606e5e58b7bd26ac640773083b61f7c;p=jalview.git

Merge branch 'features/JAL-1641_JSON-extension' into develop
---

a8a714840606e5e58b7bd26ac640773083b61f7c