Merge branch 'JAL-1340_redundancy' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 29 Apr 2014 12:25:46 +0000 (13:25 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 29 Apr 2014 12:25:46 +0000 (13:25 +0100)
commitd4a1d715ee3a334bf2a24c4e3fc17cbcd5c3962e
treeaa2e51982eebaf49c82a418a7a871872edda26e8
parent793aa31ecc707520037b7380a7b39a9db3ec7d20
parent2632600de45e84f16caae4410e6d89febdea26eb
Merge branch 'JAL-1340_redundancy' into develop