From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 8 Jul 2015 12:19:14 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Jalview_2_9~12^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f0abe70b5a54b6a9730aa5f4e2bf2bd697508757;p=jalview.git

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

f0abe70b5a54b6a9730aa5f4e2bf2bd697508757