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

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

c761d32b1a115a1f200fe280e7c546ad37e9957d