Merge branch 'MDL-47494-ddimageortext' into MDL-47494
authorTim Hunt <T.J.Hunt@open.ac.uk>
Fri, 18 Sep 2015 06:51:36 +0000 (07:51 +0100)
committerTim Hunt <T.J.Hunt@open.ac.uk>
Fri, 18 Sep 2015 06:51:36 +0000 (07:51 +0100)
commit2ce6a9c64f35a9cca3bb44b05fe4f46cbacf4a36
treea36c485b6719c4c2c64ec5ad5077aae5983f61c9
parent55d4613f22b39ab64870f0f791457385bea636b6
parent4a53044a10afdce33e066e2da98f541df94e2d73
Merge branch 'MDL-47494-ddimageortext' into MDL-47494