Merge branch 'feature/JAL-654_dssp' into develop
authorJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 11:47:08 +0000 (12:47 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 11:47:08 +0000 (12:47 +0100)
commit128fac689c56ad84e307fd1dad8bd8c2be17fbb6
tree4bbfb0fa7b9632b48a95025b00c4e4db5b0e2724
parent691783b9e7c5ebf380e6ea60353e1792b15cd7a1
parent095d07c7765f6925736c41896b9bdff8df369f4e
Merge branch 'feature/JAL-654_dssp' into develop