Merge branch 'develop' into develop_m2_8_1_2
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 14 Jun 2013 15:23:47 +0000 (16:23 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 14 Jun 2013 15:23:47 +0000 (16:23 +0100)
commit71175b4578ef89961a7846ef7777b83fc7808b0d
treedc757657e011bd86ac524336a2e1615603630aa3
parentcafb901eee70c3737c3f4a44083108d01ee78fa8
parent28b416f0fdb491114107ef88f7b60baaca1d00d7
Merge branch 'develop' into develop_m2_8_1_2