Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 21 Apr 2016 09:56:53 +0000 (10:56 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 21 Apr 2016 09:56:53 +0000 (10:56 +0100)
commit49d07daba32cb7ca7841eca72c82cdf3c8d4344d
treea0756a0cd450ad3fa8bbb10599f948d7ee7c2b67
parent35b237a7910f8b96b53938700cb427fb46e5e5af
parent2ef89644a94398867d6ebd1c9732a0828b9cb30f
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop