From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Sat, 9 Nov 2013 11:48:07 +0000 (+0000)
Subject: Merge branch 'servlets'
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3803c9757f61c3a4309252b3820fd5d9cc1a7eb8;p=proteocache.git

Merge branch 'servlets'

Conflicts:
	datadb/compbio/cassandra/CassandraNativeConnector.java
	server/compbio/statistic/CassandraRequester.java
---

3803c9757f61c3a4309252b3820fd5d9cc1a7eb8