From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Mon, 1 Jul 2013 14:16:01 +0000 (+0100)
Subject: Merge branches 'JABAWS_Release_2_1', 'JABAWS_Release_2_1' and 'JABAWS_Release_2_1... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=334a5cf783b2c7e477ee78f80102ba03079be324;hp=-c;p=jabaws.git

Merge branches 'JABAWS_Release_2_1', 'JABAWS_Release_2_1' and 'JABAWS_Release_2_1' of https://source.jalview.org/git/jabaws into JABAWS_Release_2_1
---

334a5cf783b2c7e477ee78f80102ba03079be324