Merge branch 'JAL-1332_regression' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 27 Aug 2013 14:46:32 +0000 (15:46 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 27 Aug 2013 14:46:32 +0000 (15:46 +0100)

Trivial merge