Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 15 May 2017 14:50:28 +0000 (15:50 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 15 May 2017 14:50:28 +0000 (15:50 +0100)
commit9b4c6a235744a840d6bf31e4fd06e644cebfa65a
tree0c1b7fae7fde7fb1c5c1f7244995fbf67fe0790e
parent3c9453277531bea753777d624e117e550820bd08
parent0125cee3edfa0ba5584631bae3ad9c808ec0b30d
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop