Merge branch 'master' of https://source.jalview.org/git/proteocache
authorAlexander Sherstnev <sherstnv@gmail.com>
Fri, 1 Aug 2014 10:21:12 +0000 (11:21 +0100)
committerAlexander Sherstnev <sherstnv@gmail.com>
Fri, 1 Aug 2014 10:21:12 +0000 (11:21 +0100)

Trivial merge