Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 26 Apr 2016 11:17:41 +0000 (12:17 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 26 Apr 2016 11:17:41 +0000 (12:17 +0100)
commit2facc9ee2fdb025b5cc79b005e7eb5bd915cd9ba
treee2983910e08cd917a007ec947bba715876acaf50
parent659cdd6d20a562ff4a856f2325399f2dbb398126
parentc58dcb6d4f1a6db1ef21a704fc3581a8741b81d7
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop