Merge branch 'JAL-1259_hotfix' into Release_2_8_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 31 May 2013 16:10:11 +0000 (17:10 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 31 May 2013 16:10:11 +0000 (17:10 +0100)

Trivial merge