From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 30 Aug 2016 17:06:00 +0000 (+0100)
Subject: Merge branch 'develop' into merge/develop_bug/JAL-2154projectMappings
X-Git-Tag: Release_2_10_0~47^2~4^2~26
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fmerge%2Fdevelop_bug%2FJAL-2154projectMappings;p=jalview.git

Merge branch 'develop' into merge/develop_bug/JAL-2154projectMappings
---

d2164f857e0729b86b1e0ffa4c858487f0a3298f