Merge branch 'master' of https://source.jalview.org/git/proteocache
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Tue, 29 Oct 2013 22:35:47 +0000 (22:35 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Tue, 29 Oct 2013 22:35:47 +0000 (22:35 +0000)

Trivial merge