From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Fri, 9 Aug 2013 09:19:23 +0000 (+0100)
Subject: Merge branch 'JABAWS_Release_2_5' of https://source.jalview.org/git/jabaws into JABAW... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b860f1f394b4ec68802b0539feb291765424d722;p=jabaws.git

Merge branch 'JABAWS_Release_2_5' of https://source.jalview.org/git/jabaws into JABAWS_Release_2_5
---

b860f1f394b4ec68802b0539feb291765424d722