Merge branch 'feature/JAL-1330' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Sat, 22 Jun 2013 13:17:42 +0000 (14:17 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Sat, 22 Jun 2013 13:17:42 +0000 (14:17 +0100)

Trivial merge