Merge branch 'menard' into develop_m2_8_1_2
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 18 Jun 2013 16:12:41 +0000 (17:12 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 18 Jun 2013 16:12:41 +0000 (17:12 +0100)

Trivial merge