Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 18 Sep 2015 15:35:39 +0000 (16:35 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 18 Sep 2015 15:35:39 +0000 (16:35 +0100)
1  2 
doc/UnitTesting.html

Simple merge