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

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

32169891357bba3d4bad4d8de5d2156a9705d182