Merge branch 'DAO' of https://source.jalview.org/git/proteocache into DAO
authorNatasha Sherstneva <n.shertneva@gmail.com>
Thu, 23 Jan 2014 11:01:21 +0000 (11:01 +0000)
committerNatasha Sherstneva <n.shertneva@gmail.com>
Thu, 23 Jan 2014 11:01:21 +0000 (11:01 +0000)

Trivial merge