Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 11 Jan 2016 14:58:24 +0000 (14:58 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 11 Jan 2016 14:58:24 +0000 (14:58 +0000)
commit5b079109d33a4596a8c3017dbf93b7de5b0300c5
treed7828b0bf44909cfa0499539701f89d64ab57f44
parente2399fe0a610faf5dee11a68a8643c34e3ef2490
parent8294bb03dcb1718915fe6ffa182d06b831352116
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop