Merge branch 'JAL-1139_proguard' into Release_2_8_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 25 Nov 2013 16:18:26 +0000 (16:18 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 25 Nov 2013 16:18:26 +0000 (16:18 +0000)

Trivial merge