From: Jim Procter <j.procter@dundee.ac.uk>
Date: Fri, 3 Oct 2014 10:00:46 +0000 (+0100)
Subject: Merge branch 'bugs/JAL-1138_osgi' into Release_2_8_2_Branch
X-Git-Tag: Release_2_8_2b1^2~51
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1052132a5a191173964d4e7fec936f9ee33c9ac6;p=jalview.git

Merge branch 'bugs/JAL-1138_osgi' into Release_2_8_2_Branch
---

1052132a5a191173964d4e7fec936f9ee33c9ac6