Merge branch 'JAL-1316' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 14 Jun 2013 15:23:31 +0000 (16:23 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 14 Jun 2013 15:23:31 +0000 (16:23 +0100)

Trivial merge