From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 12 Nov 2014 14:30:46 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Jalview_2_9~160
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=357dccf7919daec097dc63aa805c7336d88e89f8;p=jalview.git

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

357dccf7919daec097dc63aa805c7336d88e89f8