Merge branch 'servlets'

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

Tue, 3 Dec 2013 11:45:29 +0000 (11:45 +0000)

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

Tue, 3 Dec 2013 11:45:29 +0000 (11:45 +0000)
author Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Tue, 3 Dec 2013 11:45:29 +0000 (11:45 +0000)
committer Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Tue, 3 Dec 2013 11:45:29 +0000 (11:45 +0000)
diff --cc server/compbio/controllers/SequenceController.java
Simple merge
diff --cc server/compbio/statistic/CassandraRequester.java
Simple merge
diff --cc webapp/view/reportProteinSequences.jsp
Simple merge
author	Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
	Tue, 3 Dec 2013 11:45:29 +0000 (11:45 +0000)
committer	Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
	Tue, 3 Dec 2013 11:45:29 +0000 (11:45 +0000)
		1	2
server/compbio/controllers/SequenceController.java	patch \|	diff1 \|	diff2 \|	blob \| history
server/compbio/statistic/CassandraRequester.java	patch \|	diff1 \|	diff2 \|	blob \| history
webapp/view/reportProteinSequences.jsp	patch \|	diff1 \|	diff2 \|	blob \| history