Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 28 Oct 2014 15:52:53 +0000 (15:52 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 28 Oct 2014 15:52:53 +0000 (15:52 +0000)
commit8ba65cbf8dde2faeff8a84eae78127fb99b765a5
treede6a460e9ce5b456dadd77978a2fb153a52cac94
parentc46ac1bbccd595dfeb504220b465023d38815223
parentdefbcc5ef50f2287ea40d4a196495ba33b986eb7
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop