Merge branch 'features/JAL-2136_phyre2_integration' into spikes/phyre
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 22 May 2017 16:59:04 +0000 (17:59 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 22 May 2017 16:59:04 +0000 (17:59 +0100)

Trivial merge