Merge branch 'feature/JAL-654_dssp' into Release_2_8_2_Branch
authorJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 11:46:56 +0000 (12:46 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 11:46:56 +0000 (12:46 +0100)

Trivial merge