Merge branch 'master' into servlets
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 8 Nov 2013 13:59:53 +0000 (13:59 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 8 Nov 2013 13:59:53 +0000 (13:59 +0000)
commit27060ede81676b3e84f13e2ea2f25836d8c3f6fa
treeca38e79d27e0a40ed0c794da75888163a08b0aa9
parent081a5e5fa603ce8b76625c23ab479c97f653633e
parentebb5818e5e6721ce768b26e7c8448d25d74d3cfb
Merge branch 'master' into servlets

Conflicts:
.classpath
datadb/compbio/cassandra/CassandraNativeConnector.java
datadb/compbio/cassandra/JpredParserHTTP.java
datadb/compbio/cassandra/JpredParserLocalFile.java
server/compbio/listeners/ContextListener.java
server/compbio/statistic/CassandraRequester.java
website/QuerySequenceProtein.jsp
website/ReportLength.jsp
website/ReportNew.jsp
.classpath
datadb/compbio/cassandra/CassandraNativeConnector.java
datadb/compbio/cassandra/JpredParserHTTP.java
datadb/compbio/cassandra/JpredParserLocalFile.java