Merge branch '2_8_1_patch_multiharmony' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Sun, 9 Jun 2013 14:30:55 +0000 (15:30 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Sun, 9 Jun 2013 14:30:55 +0000 (15:30 +0100)

Trivial merge