From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 26 Apr 2016 11:17:41 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~249^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2facc9ee2fdb025b5cc79b005e7eb5bd915cd9ba;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

2facc9ee2fdb025b5cc79b005e7eb5bd915cd9ba