From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Thu, 4 Jun 2015 09:52:06 +0000 (+0100)
Subject: Merge branch 'features/JAL-1641_JSON-extension' into develop
X-Git-Tag: Release_2_10_0~640^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=49108f16b31dfc534aa148c2c85b85c98fbbddf8;hp=492340a6ceedebe4c496d8a4673eb2f1ff835b38;p=jalview.git

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