Merge branch 'JABAWS_Release_2_5' of https://source.jalview.org/git/jabaws into JABAW...
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 6 Sep 2013 15:33:09 +0000 (16:33 +0100)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 6 Sep 2013 15:33:09 +0000 (16:33 +0100)

Trivial merge