Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 2 Sep 2015 12:40:32 +0000 (13:40 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 2 Sep 2015 12:40:32 +0000 (13:40 +0100)
commit07a5100abc0808d2cea5b81c1ce1667d679b56bb
treeaa05943883d9b8375818fe5d13a868c6575c9703
parentcb231b238443611effe9ed859f1e9d4370882f9b
parent8f6a276a88da8aa97fd31e1374f1fb9f2eee0918
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop