Merge branch 'JAL-1364_patch' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Feb 2014 16:28:21 +0000 (16:28 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Feb 2014 16:28:21 +0000 (16:28 +0000)
commit684afef0d5e84a6bcc49d1941c6dbfda5051c9f1
treeeb54259e217ed3973a48db6da4e0e00110d39b97
parentfbcb900b512c2229699c536beac69acc2a7457d7
parentb920a3c8476e5f43399393d580d4e3d8b79c15b6
Merge branch 'JAL-1364_patch' into develop