Merge branch 'DAO'
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 31 Jan 2014 16:34:26 +0000 (16:34 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 31 Jan 2014 16:34:26 +0000 (16:34 +0000)
commit986f73f677c2e0cc6bc452d3f2e0cf9b7a4108aa
tree025762ea171223bac899551d3fe0e16790d50ca7
parentdb6ea93133979ad97453a89fac0506b69d104ea6
parentd1048dc77b419ac536dee9ce6fa3113613172b9c
Merge branch 'DAO'

Conflicts:
datadb/compbio/cassandra/CassandraReaderOld.java
server/compbio/ws/jpred/jaxws/FindJobForSequence.java
server/compbio/ws/jpred/jaxws/FindJobForSequenceResponse.java
server/compbio/ws/jpred/jaxws/GetArchive.java
server/compbio/ws/jpred/jaxws/GetArchiveResponse.java