Merge branch 'JWS-36' into JABAWS_Release_2_0
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 1 Jun 2012 10:08:28 +0000 (11:08 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 1 Jun 2012 10:08:28 +0000 (11:08 +0100)
commitd82962f93e943d0565c8ded976dc2ce9d7246361
treecbd6b1573c765cc017624b18e2f5c658e69b4922
parent55c98899ff648c53c8d53fe308c4b26f8d6f9468
parentd96a2f4679fa106e7beed4466f63a9191faa5b90
Merge branch 'JWS-36' into JABAWS_Release_2_0