From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 11 May 2015 09:44:16 +0000 (+0100)
Subject: Merge branch 'features/JAL-1641_JSON_' into develop
X-Git-Tag: Release_2_10_0~682^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2a42323bc7b92e39c676fc46768f28d032f2f686;p=jalview.git

Merge branch 'features/JAL-1641_JSON_' into develop
---

2a42323bc7b92e39c676fc46768f28d032f2f686