Merge branch 'servlets'

author Sasha Sherstnev <a.sherstnev@dundee.ac.uk>

Wed, 20 Nov 2013 16:51:30 +0000 (16:51 +0000)

committer Sasha Sherstnev <a.sherstnev@dundee.ac.uk>

Wed, 20 Nov 2013 16:51:30 +0000 (16:51 +0000)
author Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Wed, 20 Nov 2013 16:51:30 +0000 (16:51 +0000)
committer Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Wed, 20 Nov 2013 16:51:30 +0000 (16:51 +0000)
diff --cc datadb/compbio/cassandra/CassandraWriter.java
Simple merge
diff --cc datadb/compbio/cassandra/JpredParserHTTP.java
Simple merge
author	Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
	Wed, 20 Nov 2013 16:51:30 +0000 (16:51 +0000)
committer	Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
	Wed, 20 Nov 2013 16:51:30 +0000 (16:51 +0000)
		1	2
datadb/compbio/cassandra/CassandraWriter.java	patch \|	diff1 \|	diff2 \|	blob \| history
datadb/compbio/cassandra/JpredParserHTTP.java	patch \|	diff1 \|	diff2 \|	blob \| history