Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 15 Jun 2015 11:19:54 +0000 (12:19 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 15 Jun 2015 11:19:54 +0000 (12:19 +0100)
commitb3206ecee2cb2787e7481c7aefc73f06fc3798c1
tree4119b6a7da599a7f2546a5bc852409e55de3f03c
parentfd1c6fd67abdd50ff0d77410d3da9be66be315ce
parent1152ad2009cfc7bf521b6bcb556f6031bbe5b86a
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop