Merge branch 'bugs/JAL-1138_osgi' into Release_2_8_2_Branch
authorJim Procter <j.procter@dundee.ac.uk>
Fri, 3 Oct 2014 10:00:46 +0000 (11:00 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Fri, 3 Oct 2014 10:00:46 +0000 (11:00 +0100)
commit1052132a5a191173964d4e7fec936f9ee33c9ac6
treeaf9259c64b4225be9f080a8452b356da4ec85adf
parentc761d32b1a115a1f200fe280e7c546ad37e9957d
parent2fa2eead4ad3bd86197e691a6a86d9c0425a0174
Merge branch 'bugs/JAL-1138_osgi' into Release_2_8_2_Branch