Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 20 Jun 2016 12:52:40 +0000 (13:52 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 20 Jun 2016 12:52:40 +0000 (13:52 +0100)
commitd52084e9014ef22f4449e35307a940d0e6f5766d
treea9f1c7663541aa4929219c21e3687d7b68a5ce12
parent54df37fffa15c0fe522b96ba5a443f3ba21e54d3
parent834383568d0787279ba0f3394f20c7d1032af827
Merge branch 'develop' of source.jalview.org/git/jalview into develop