Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Mon, 29 Jan 2018 17:42:12 +0000 (17:42 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Mon, 29 Jan 2018 17:42:12 +0000 (17:42 +0000)

Trivial merge