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)
commit911c6630cec6fa5253821a7e18a13d0d4df3627c
tree4bbfb0fa7b9632b48a95025b00c4e4db5b0e2724
parenta0d3647da9f02df7c5a13f59e5db552e7567974f
parent095d07c7765f6925736c41896b9bdff8df369f4e
Merge branch 'feature/JAL-654_dssp' into Release_2_8_2_Branch