Merge branch '2_8_1_patch_multiharmony' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 7 Jun 2013 15:33:07 +0000 (16:33 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 7 Jun 2013 15:33:07 +0000 (16:33 +0100)
commit529865430541d236afe5e3c8f0f760d74a010634
tree60c58761ff4eebfe4c188c9e1711953f66cb964e
parent08c9327201cdf77a77bf884f3c5fa45cdaf8bc7f
parent85aca696b1e649b3a3f91bde9c542de7d026d52d
Merge branch '2_8_1_patch_multiharmony' into develop