Merge branch 'servlets'
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Wed, 20 Nov 2013 16:51:30 +0000 (16:51 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Wed, 20 Nov 2013 16:51:30 +0000 (16:51 +0000)
commitc0b0fef9166684f5e7cfacbc3701471ec8967f56
tree5242006b560721d1f2d6655f086a9db1417bf7ed
parent0c067708b917375dbf1cd96ff5a65496c6821f20
parent4ec4e979c9020b6c5302659fb09a41fa35bf68fb
Merge branch 'servlets'
datadb/compbio/cassandra/CassandraWriter.java
datadb/compbio/cassandra/JpredParserHTTP.java