Merge branch 'features/JAL-1333' into develop
authorj.procter@dundee.ac.uk <jprocter@jims-mbp-2.home>
Tue, 22 Jul 2014 19:15:23 +0000 (20:15 +0100)
committerj.procter@dundee.ac.uk <jprocter@jims-mbp-2.home>
Tue, 22 Jul 2014 19:15:23 +0000 (20:15 +0100)
commite043335670d500e54bfb40f4a2c37917f651c5b3
tree00e47953baf9842b7aa0e1eddbff63b7e5a66c20
parentb72c67c9197942b0dabfc3980e0d1d5b41813091
parent8149ee3ab3c19c60463adc13e4212f1f19b19331
Merge branch 'features/JAL-1333' into develop
jpred + ucsf chimera bits