Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 31 Aug 2016 15:35:42 +0000 (16:35 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 31 Aug 2016 15:35:42 +0000 (16:35 +0100)
commit5b2d39b4a3fd1860ffb4874da9b73cd3436af79f
treed0f580f16582f8ce6234ecc0a32ef48291d4e101
parentbefb1682d3f7d181e61d62adf20e31d53caf2671
parent43522cd06017137882e382baad33cbeef02bbbe9
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop