Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 22 Jun 2016 11:54:43 +0000 (12:54 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 22 Jun 2016 11:54:43 +0000 (12:54 +0100)
commitf2b86d72de53efb41fd1d57335fb0a61a9efe3ea
tree2b31ecfc1d0e61477c2d0e8636e956c6ec6535a2
parentaa942b856b678f7461f041850495698a46e9c7c7
parentf7c9911a43d7b85a3f0097eb99825b73f3a95713
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop