Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 27 Aug 2015 10:45:47 +0000 (11:45 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 27 Aug 2015 10:45:47 +0000 (11:45 +0100)
commitc1050f974b195d1d2ec825cbca8f7f7884050986
treebf08b6cbe8921ed4a728ef0786c2ca3a165303b1
parenta64b7f939013894d633a5446dab8519fab895f64
parent670b2a6a65de601227103c2f79730f2adbfee247
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop