From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 21 Jul 2015 13:53:27 +0000 (+0100)
Subject: Merge branch 'ismb/2015_demo' into develop
X-Git-Tag: Release_2_10_0~569^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4446b541b30d3391bd6df2441d890d94a3bbb263;p=jalview.git

Merge branch 'ismb/2015_demo' into develop
---

4446b541b30d3391bd6df2441d890d94a3bbb263