Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 22 Mar 2016 08:42:26 +0000 (08:42 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 22 Mar 2016 08:42:26 +0000 (08:42 +0000)
commit31550615d6496099a12775c8a58f29e7cc926fad
tree4ee59dcc93e03683bf4e128c9d03ab54f874dff0
parentdeb6365c5607804ab43f8bb29e7d1a11f298789b
parentf3da4113cd7d574966523982ed5145a918c63556
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop