Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 14 Jun 2016 16:48:04 +0000 (17:48 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 14 Jun 2016 16:48:04 +0000 (17:48 +0100)
commit85246904e92e140d75830e191e7eb3e4467dac06
tree5b24bfbf56087b1a2570a30bf403e659f75cc352
parent3ed7245df7c9a34406446ba012690ce7abc6ca42
parent469f115c9d248bcae315c0eb591f357ce0f24bd0
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop