Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 23 Mar 2016 15:37:53 +0000 (15:37 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 23 Mar 2016 15:37:53 +0000 (15:37 +0000)
commit0f61ed3a492c115c5047fc862104111d83b62256
treec5dda9e81be9e2ae406869b0af32a9f338c20070
parentb40bbf24867e2f44c40e9af6cf43bdfee29c337c
parent9fe87bd08ab29b6fe53364f387d7a2e3a8d39994
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop