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

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

45f546c71f94606ab43389d596139606bd001656