Merge branch 'bugs/JAL-1138_osgi' into Release_2_8_2_Branch
authorJim Procter <j.procter@dundee.ac.uk>
Fri, 3 Oct 2014 09:55:18 +0000 (10:55 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Fri, 3 Oct 2014 09:55:18 +0000 (10:55 +0100)
commitc761d32b1a115a1f200fe280e7c546ad37e9957d
tree27daa4c6a8741bcd09672e0dc0a5626f28361a0b
parent55fc8f004dac252b5b89ac91cf506e4844a6b1da
parent971ca3752d1e1139b8fa1c9bd80698e4d83dcab7
Merge branch 'bugs/JAL-1138_osgi' into Release_2_8_2_Branch