Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 17 Jun 2015 07:50:13 +0000 (08:50 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 17 Jun 2015 07:50:13 +0000 (08:50 +0100)
commita4b8cec2530a9ebd51fecc1abcc4152fc778908b
treea8e8613465cf0418d5508084b65c0482b6d768e6
parent0f26441e26325c728a3e9a108ac425d4d60dde1c
parentde75573aa38c4b40686256d4332c3a069b6a98ca
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop