From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Fri, 8 Nov 2013 14:03:34 +0000 (+0000)
Subject: Merge branch 'master' into servlets
X-Git-Url: http://source.jalview.org/gitweb/?p=proteocache.git;a=commitdiff_plain;h=fc9c3424a6007fa50648c7159d981f4225bc5933

Merge branch 'master' into servlets

Conflicts:
	server/compbio/listeners/ServletSequenceProtein.java
	server/compbio/statistic/CassandraRequester.java
---

fc9c3424a6007fa50648c7159d981f4225bc5933