From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 30 Jun 2015 11:42:25 +0000 (+0100)
Subject: Merge branch 'features/JAL-1641_JSON-tests-and-docs' into develop
X-Git-Tag: Release_2_10_0~585^2~10
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7703a6a091c65e45bfb8f4d056cd2cbdb19b3535;p=jalview.git

Merge branch 'features/JAL-1641_JSON-tests-and-docs' into develop
---

7703a6a091c65e45bfb8f4d056cd2cbdb19b3535