From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 27 Aug 2015 11:34:07 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Jalview_2_9~10^2~9
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=35239f8b43e99eed4c6d81f018b86704ca1e81b7;p=jalview.git

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

35239f8b43e99eed4c6d81f018b86704ca1e81b7