Merge branch 'menard' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 4 Dec 2012 10:37:24 +0000 (10:37 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 4 Dec 2012 10:37:24 +0000 (10:37 +0000)

Trivial merge