From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Fri, 6 Sep 2013 15:33:09 +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=1ccf3b8178d3a5ca754b38ec14a69207fba79665;hp=-c;p=jabaws.git

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

1ccf3b8178d3a5ca754b38ec14a69207fba79665