Merge branch 'develop' into develop_m2_8_1_2
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Sun, 23 Jun 2013 13:00:23 +0000 (14:00 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Sun, 23 Jun 2013 13:00:23 +0000 (14:00 +0100)

Trivial merge