Merge branch 'JAL-1161_optimisingAnnotationPanel' (early part) into Release_2_8_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 24 May 2013 14:14:01 +0000 (15:14 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 24 May 2013 14:14:01 +0000 (15:14 +0100)

Trivial merge