Merge branch 'MDL-52054-master-option4' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Nov 2015 09:17:51 +0000 (09:17 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Nov 2015 09:17:51 +0000 (09:17 +0000)
commit022f5b5e505d1360fe6a361ff3eb78196ca7b6d1
tree5449d95b9cb3c2c1c790407dc1d95618c8853e18
parent32b4161a3c834d8f99f02b3a98400843197a41ae
parent616dd1b59446aa1101268f80fe18b0d0beb1372d
Merge branch 'MDL-52054-master-option4' of git://github.com/xow/moodle