Merge branch 'JAL-1294_iupredexportimport' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Jun 2013 13:12:56 +0000 (14:12 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Jun 2013 13:12:56 +0000 (14:12 +0100)

Trivial merge