Merge branch 'JAL-1226' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Wed, 26 Feb 2014 17:23:11 +0000 (17:23 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Wed, 26 Feb 2014 17:23:11 +0000 (17:23 +0000)

Trivial merge