Merge branch 'forpush/JAL-674_dssp' into develop
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 11:06:49 +0000 (12:06 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 11:06:49 +0000 (12:06 +0100)
commit5efa5871d51fbfb994b12f8f1575da6f4c860d54
tree504a140beebb54f34d36aa88b4878646ef5e1134
parenta8da65d162cc0c0778e8087a0ac21b6621523c14
parent044474c2d4d044de3f4590f170db8d856cccc488
Merge branch 'forpush/JAL-674_dssp' into develop